Changeset 2560 for lm-sensors/trunk/prog/detect/sensors-detect

Timestamp:

05/23/04 09:18:42 (9 years ago)

Author:

khali

Message:

Prevent unknown/disabled adapters from appearing more than

once in modprobe list.
Hide unknown/disabled adapters algorithm (useless, and doesn't
work in 2.6 anyway).

Files:

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

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

@@ -4386 +4386 @@
           not (exists $detection->{isa_addr} and $prefer_isa)) {
          foreach $adap (@adapters) {
+           next unless exists $adap->{driver};
            $adap->{nr_later} = $nr++ if $adap->{driver} eq $detection->{i2c_driver};
          }
@@ -4398 +4399 @@
   for ($i = 0; $i < $nr; $i++) {
     foreach $adap (@adapters) {
+      next unless exists $adap->{nr_later} and $adap->{nr_later} == $i;
       if ($adap->{driver} eq "UNKNOWN") {
-        $modprobes .= "# modprobe unknown adapter ".$adap->{adapname}." using ". $adap->{algoname}."\n";
+        $modprobes .= "# modprobe unknown adapter ".$adap->{adapname}."\n";
       } elsif ($adap->{driver} eq "DISABLED") {
-        $modprobes .= "# modprobe disabled adapter ".$adap->{adapname}." using ". $adap->{algoname}."\n";
+        $modprobes .= "# modprobe disabled adapter ".$adap->{adapname}."\n";
       } elsif ($adap->{driver} eq "to-be-written") {
-        $modprobes .= "# no driver available for adapter ".$adap->{adapname}." using ". $adap->{algoname}."\n";
+        $modprobes .= "# no driver available for adapter ".$adap->{adapname}."\n";
       } else {
-        $modprobes .= "modprobe $adap->{driver}\n" if (defined($adap->{nr_later}) and $adap->{nr_later} == $i) and not $modprobes =~ /modprobe $adap->{driver}\n/;
+        $modprobes .= "modprobe $adap->{driver}\n"
+          unless $modprobes =~ /modprobe $adap->{driver}\n/;
       }
+      last;
     }
   }