diff options
| author | Juerg Haefliger <juergh@gmail.com> | 2008-01-26 08:54:24 -0800 |
|---|---|---|
| committer | Mark M. Hoffman <mhoffman@lightlink.com> | 2008-02-07 20:39:44 -0500 |
| commit | 345a22245451c0fd2c44b2afb5dfb75628b487fa (patch) | |
| tree | 79e0e2d9f6307c0359981cc990e6364d31918594 /drivers/hwmon/dme1737.c | |
| parent | ff8421f733c91a70d8edadf9ce2842fca66172fa (diff) | |
| download | kernel_samsung_smdk4412-345a22245451c0fd2c44b2afb5dfb75628b487fa.zip kernel_samsung_smdk4412-345a22245451c0fd2c44b2afb5dfb75628b487fa.tar.gz kernel_samsung_smdk4412-345a22245451c0fd2c44b2afb5dfb75628b487fa.tar.bz2 | |
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>
Diffstat (limited to 'drivers/hwmon/dme1737.c')
| -rw-r--r-- | drivers/hwmon/dme1737.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/dme1737.c b/drivers/hwmon/dme1737.c index 307f48d..ddddd9f 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; |