From: Juerg Haefliger <juergh@gmail.com>
Date: Sat, 26 Jan 2008 16:54:24 +0000 (-0800)
Subject: hwmon: (dme1737) fix Super-IO device ID override
X-Git-Tag: v2.6.25-rc1~281^2~11
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=345a22245451c0fd2c44b2afb5dfb75628b487fa;p=linux-2.6-omap-h63xx.git

hwmon: (dme1737) fix Super-IO device ID override

The dme1737 has a second place where the Super-IO device ID is
checked. This has been missed by Jean's initial patch that adds
support for user-controlled Super-IO device ID override. This patch
fixes this issue.

Signed-off-by: Juerg Haefliger <juergh at gmail.com>
Acked-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
---

diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c
index 307f48de051..ddddd9f34c1 100644
--- a/drivers/hwmon/dme1737.c
+++ b/drivers/hwmon/dme1737.c
@@ -2030,7 +2030,7 @@ static int dme1737_i2c_get_features(int sio_cip, struct dme1737_data *data)
 
 	/* Check device ID
 	 * The DME1737 can return either 0x78 or 0x77 as its device ID. */
-	reg = dme1737_sio_inb(sio_cip, 0x20);
+	reg = force_id ? force_id : dme1737_sio_inb(sio_cip, 0x20);
 	if (!(reg == 0x77 || reg == 0x78)) {
 		err = -ENODEV;
 		goto exit;