Changeset 2526

Timestamp:

05/12/04 21:41:37 (9 years ago)

Author:

khali

Message:

Fix double detection of ISA chips.

No, don't ask for drivers, we're busy.

Files:

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

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

@@ -2391 +2391 @@
   # Find out whether our new entry should go into the detected or the
   # misdetected list. We only compare main isa_addr here, of course.
+  # (Khali 2004-05-12) If the driver is the same, the "misdetected"
+  # entry is simply deleted; same we do for I2C chips.
   foreach $main_entry (@chips_detected) {
     $detected_ref = $main_entry->{detected};
@@ -2398 +2400 @@
           $detected_ref->[$i]->{isa_addr} == $datahash->{isa_addr}) {
         if ($detected_ref->[$i]->{conf} >= $datahash->{conf}) {
-          push @$new_misdetected_ref, $datahash;
+          push @$new_misdetected_ref, $datahash
+            unless $main_entry->{driver} eq $chipdriver;
         } else {
-          push @$misdetected_ref,$detected_ref->[$i];
+          push @$misdetected_ref,$detected_ref->[$i]
+            unless $main_entry->{driver} eq $chipdriver;
           splice @$detected_ref, $i,1;
           push @$new_detected_ref, $datahash;
@@ -4354 +4358 @@
     next if not @{$chip->{detected}};
     if ($chip->{driver} eq "to-be-written") {
-      $modprobes .= "# no driver for $chip->{detected}[0]{chipname} yet, ask us for one!\n";
+      $modprobes .= "# no driver for $chip->{detected}[0]{chipname} yet\n";
     } else {
       $modprobes .= "modprobe $chip->{driver}\n";