From 247b6a7deddcb57e3d1d893a16ddfb8ccfdab02c Mon Sep 17 00:00:00 2001 From: Frodo Looijaard Date: Wed, 2 Feb 2000 20:57:46 +0000 Subject: [PATCH] Fixed two slight errors regarding the new bus handling code for sensors-detect. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@723 7894878c-1315-0410-8ee3-d5d059ff63e0 --- prog/detect/sensors-detect | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect index ca61d4fa..e7cf6e2d 100755 --- a/prog/detect/sensors-detect +++ b/prog/detect/sensors-detect @@ -1822,7 +1822,7 @@ sub generate_modprobes # If there is more than one bus detected by a driver, they are # still all added. So we number them in the correct order if (exists $detection->{i2c_driver} and - not exists $adapters[$detection->{i2c_devnr}]->{nr} and + not exists $adapters[$detection->{i2c_devnr}]->{nr_later} and not (exists $detection->{isa_addr} and $prefer_isa)) { foreach $adap (@adapters) { $adap->{nr_later} = $nr++ if $adap->{driver} eq $detection->{i2c_driver}; @@ -1837,7 +1837,7 @@ sub generate_modprobes for ($i = 0; $i < $nr; $i++) { foreach $adap (@adapters) { - $modprobes .= "modprobe $adap->{driver}\n" if (defined($adap->{nr_later}) and $adap->{nr_later} == $i); + $modprobes .= "modprobe $adap->{driver}\n" if (defined($adap->{nr_later}) and $adap->{nr_later} == $i) and not $modprobes =~ /modprobe $adap->{driver}\n/; } } $modprobes .= "modprobe i2c-isa\n" if ($isa);