Changeset 5847 for lm-sensors/trunk/prog

Timestamp:

07/05/10 18:50:27 (23 months ago)

Author:

khali

Message:

Don't create entries for new drivers before we have something to
add to them. If we have multiple detections at the same I2C
address, one will be discarded so its driver shouldn't be recorded.

Files:

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

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

@@ -2952 +2952 @@
 {
         my ($chipdriver, $datahash) = @_;
-        my ($i, $new_detected_ref, $detected_ref, $detected_entry,
+        my ($i, $detected_ref, $detected_entry,
             $put_in_detected, @hash_addrs, @entry_addrs);
-
-        # First determine where the hash has to be added.
-        $chips_detected{$chipdriver} = []
-                unless exists $chips_detected{$chipdriver};
-        $new_detected_ref = $chips_detected{$chipdriver};
 
         # Find out whether our new entry should go into the detected list
@@ -3004 +2999 @@
 
         # Now add the new entry to detected
-        push @$new_detected_ref, $datahash;
+        $chips_detected{$chipdriver} = []
+                unless exists $chips_detected{$chipdriver};
+        push @{$chips_detected{$chipdriver}}, $datahash;
 }