[lm-sensors] [PATCH 2/3] hwmon (dme1737): skip detection if forced

[lm-sensors] [PATCH 2/3] hwmon (dme1737): skip detection if forced

[Juerg Haefliger]

[-- Attachment #1: Type: text/plain, Size: 160 bytes --]

Skip the checking of the device ID register in the hwmon register block 
if the force_id option is used.

Signed-off-by: Juerg Haefliger <juergh at gmail.com>


[-- Attachment #2: dme1737-skip-detection-if-forced.patch --]
[-- Type: text/x-patch, Size: 1091 bytes --]

Skip the checking of the device ID register in the hwmon register block if
the force_id option is used.

Signed-off-by: Juerg Haefliger <juergh at gmail.com>

Index: linux/drivers/hwmon/dme1737.c
===================================================================
--- linux.orig/drivers/hwmon/dme1737.c	2008-04-22 22:02:45.000000000 -0700
+++ linux/drivers/hwmon/dme1737.c	2008-04-22 22:09:10.000000000 -0700
@@ -2360,13 +2360,16 @@
 	client->addr = res->start;
 	platform_set_drvdata(pdev, data);
 
-	company = dme1737_read(client, DME1737_REG_COMPANY);
-	device = dme1737_read(client, DME1737_REG_DEVICE);
-
-	if (!((company == DME1737_COMPANY_SMSC) &&
-	      (device == SCH311X_DEVICE))) {
-		err = -ENODEV;
-		goto exit_kfree;
+	/* Skip chip detection if module is loaded with force_id parameter */
+	if (!force_id) {
+		company = dme1737_read(client, DME1737_REG_COMPANY);
+		device = dme1737_read(client, DME1737_REG_DEVICE);
+
+		if (!((company == DME1737_COMPANY_SMSC) &&
+		      (device == SCH311X_DEVICE))) {
+			err = -ENODEV;
+			goto exit_kfree;
+		}
 	}
 	data->type = -1;
 

[-- Attachment #3: Type: text/plain, Size: 153 bytes --]

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors

Re: [lm-sensors] [PATCH 2/3] hwmon (dme1737): skip detection if

[Jean Delvare]

On Tue, 22 Apr 2008 22:24:56 -0700, Juerg Haefliger wrote:
> Skip the checking of the device ID register in the hwmon register block 
> if the force_id option is used.
> 
> Signed-off-by: Juerg Haefliger <juergh at gmail.com>

Of course, otherwise the force_id parameter just can't work. Good catch.

Acked-by: Jean Delvare <khali@linux-fr.org>

-- 
Jean Delvare

_______________________________________________
lm-sensors mailing list
lm-sensors@lm-sensors.org
http://lists.lm-sensors.org/mailman/listinfo/lm-sensors