From 65c760c9ff52c57219d3efad520fc1dc441d94a2 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sat, 19 Feb 2005 19:17:17 +0000 Subject: [PATCH] Properly differenciate between ADM1027 and ADT7463. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@2916 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/chips/lm85.c | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/kernel/chips/lm85.c b/kernel/chips/lm85.c index 6c03a0ef..2c0b0ad8 100644 --- a/kernel/chips/lm85.c +++ b/kernel/chips/lm85.c @@ -780,18 +780,12 @@ int lm85_detect(struct i2c_adapter *adapter, int address, printk("lm85: Unrecgonized version/stepping 0x%02x" " Defaulting to Generic LM85.\n", verstep ); kind = any_chip ; - } else if( company == LM85_COMPANY_ANALOG_DEV - && verstep == LM85_VERSTEP_ADM1027 ) { - kind = adm1027 ; - } else if( company == LM85_COMPANY_ANALOG_DEV - && verstep == LM85_VERSTEP_ADT7463 ) { - kind = adt7463 ; } else if( company == LM85_COMPANY_ANALOG_DEV && (verstep & LM85_VERSTEP_VMASK) == LM85_VERSTEP_GENERIC) { - printk("lm85: Detected Analog Devices chip\n"); - printk("lm85: Unrecgonized version/stepping 0x%02x" - " Defaulting to Generic LM85.\n", verstep ); - kind = any_chip ; + if (verstep >= LM85_VERSTEP_ADT7463) + kind = adt7463; + else + kind = adm1027; } else if( company == LM85_COMPANY_SMSC && (verstep == LM85_VERSTEP_EMC6D100_A0 || verstep == LM85_VERSTEP_EMC6D100_A1) ) {