From a2a75fc49e457fd3db816cb7c92747a52116689b Mon Sep 17 00:00:00 2001 From: Philip Edelbrock Date: Thu, 15 Apr 1999 20:03:45 +0000 Subject: [PATCH] (Phil) A couple minor detection/kind-determination fixes. git-svn-id: http://lm-sensors.org/svn/lm-sensors/trunk@394 7894878c-1315-0410-8ee3-d5d059ff63e0 --- kernel/chips/adm1021.c | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/kernel/chips/adm1021.c b/kernel/chips/adm1021.c index 1165af91..e0c168de 100644 --- a/kernel/chips/adm1021.c +++ b/kernel/chips/adm1021.c @@ -217,24 +217,17 @@ static int adm1021_detect(struct i2c_adapter *adapter, int address, int kind) new_client->adapter = adapter; new_client->driver = &adm1021_driver; - /* Now, we do the remaining detection. */ - - if (kind < 0) { - if ((adm1021_read_value(new_client,ADM1021_REG_STATUS) & 0x03) != 0x80) - goto ERROR1; - } - /* Determine the chip type. */ if (kind <= 0) { i = adm1021_read_value(new_client,ADM1021_REG_MAN_ID); if (i == 0x41) - kind = max1617; + kind = adm1021; else if ((i== 0x4d) && (adm1021_read_value(new_client,ADM1021_REG_DEV_ID) == 0x01)) kind = max1617a; else - kind = adm1021; + kind = max1617; } if (kind == max1617) {