Changeset 5849

Timestamp:

07/05/10 20:40:44 (3 years ago)

Author:

khali

Message:

Fix r5847 was incomplete. Handling misdetections that happen after
correct detections isn't sufficient, we also have to handle
misdetections which happen first. In that case, we must delete the
driver entry as we remove the last misdetection from it.

Files:

• lm-sensors/trunk/prog/detect/sensors-detect (modified) (3 diffs)

lm-sensors/trunk/prog/detect/sensors-detect

@@ -2952 +2952 @@
 {
         my ($chipdriver, $datahash) = @_;
-        my ($i, $detected_ref, $detected_entry,
+        my ($i, $detected_ref, $detected_entry, $driver,
             $put_in_detected, @hash_addrs, @entry_addrs);
 
@@ -2985 +2985 @@
         # sub address. This may not be the best idea to do, as it may remove
         # detections without replacing them with second-best ones. Too bad.
-        foreach $detected_ref (values %chips_detected) {
+        foreach $driver (keys %chips_detected) {
+                $detected_ref = $chips_detected{$driver};
                 for ($i = @$detected_ref-1; $i >=0; $i--) {
                         next unless defined $detected_ref->[$i]->{i2c_addr};
@@ -2994 +2995 @@
                             any_list_match(\@entry_addrs, \@hash_addrs)) {
                                 splice @$detected_ref, $i, 1;
+                                delete $chips_detected{$driver}
+                                        if (!@$detected_ref);
                         }
                 }