From bf3be669933e72d876417d1355b8fbda32195902 Mon Sep 17 00:00:00 2001
From: Frodo Looijaard <frodol@dds.nl>
Date: Tue, 2 Mar 1999 10:04:21 +0000
Subject: [PATCH] More bug fixes. Try again, etc.

git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@291 7894878c-1315-0410-8ee3-d5d059ff63e0
---
 prog/detect/detect.pl      | 5 ++++-
 prog/detect/sensors-detect | 5 ++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/prog/detect/detect.pl b/prog/detect/detect.pl
index 8ee441b3..db23d05c 100755
--- a/prog/detect/detect.pl
+++ b/prog/detect/detect.pl
@@ -752,6 +752,9 @@ sub add_i2c_to_chips_detected
   FIND_LOOP:
   foreach $main_entry (@chips_detected) {
     foreach $detected_entry (@{$main_entry->{detected}}) {
+      @entry_addrs = ($detected_entry->{i2c_addr});
+      push @entry_addrs, @{$detected_entry->{i2c_sub_addrs}}
+               if exists $datahash->{i2c_sub_addrs};
       if ($detected_entry->{i2c_devnr} == $datahash->{i2c_devnr} and
           any_list_match \@entry_addrs, \@hash_addrs) {
         if ($detected_entry->{conf} >= $datahash->{conf}) {
@@ -832,7 +835,7 @@ sub add_isa_to_chips_detected
            print("Can't open ",
                  "/dev/i2c-$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),
            next;
-      i2c_set_slave_addr \*FILE,$new_misdetected_ref->[$i]->{address} or
+      i2c_set_slave_addr \*FILE,$new_misdetected_ref->[$i]->{i2c_addr} or
            print("Can't set I2C address for ",
                  "/dev/i2c-$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),
            next;
diff --git a/prog/detect/sensors-detect b/prog/detect/sensors-detect
index 8ee441b3..db23d05c 100755
--- a/prog/detect/sensors-detect
+++ b/prog/detect/sensors-detect
@@ -752,6 +752,9 @@ sub add_i2c_to_chips_detected
   FIND_LOOP:
   foreach $main_entry (@chips_detected) {
     foreach $detected_entry (@{$main_entry->{detected}}) {
+      @entry_addrs = ($detected_entry->{i2c_addr});
+      push @entry_addrs, @{$detected_entry->{i2c_sub_addrs}}
+               if exists $datahash->{i2c_sub_addrs};
       if ($detected_entry->{i2c_devnr} == $datahash->{i2c_devnr} and
           any_list_match \@entry_addrs, \@hash_addrs) {
         if ($detected_entry->{conf} >= $datahash->{conf}) {
@@ -832,7 +835,7 @@ sub add_isa_to_chips_detected
            print("Can't open ",
                  "/dev/i2c-$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),
            next;
-      i2c_set_slave_addr \*FILE,$new_misdetected_ref->[$i]->{address} or
+      i2c_set_slave_addr \*FILE,$new_misdetected_ref->[$i]->{i2c_addr} or
            print("Can't set I2C address for ",
                  "/dev/i2c-$new_misdetected_ref->[$i]->{i2c_devnr}?!?\n"),
            next;