summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2009-10-24 13:28:47 +0200
committerGreg Kroah-Hartman <gregkh@suse.de>2009-11-09 16:22:59 -0800
commit532d2b259d9cd9450eb7b500405cfe3e6c2f7aa7 (patch)
treeb3dd6dfc9f709789603af862433b9bdf2cadb33e
parent44791e49b282eb1901b28d27d9756ace8f873dca (diff)
downloadlwn-532d2b259d9cd9450eb7b500405cfe3e6c2f7aa7.tar.gz
lwn-532d2b259d9cd9450eb7b500405cfe3e6c2f7aa7.zip
hwmon: (it87) Fix VID reading on IT8718F/IT8720F
commit 371dc4a6d8c3c74a9a1c74b87c2affb3fcef6500 upstream. Comparing apples to bananas doesn't seem right. Consistently use the chips enum for chip type comparisons, to avoid such bugs in the future. The bug has been there since support for the IT8718F was added, so VID never worked for this chip nor for the similar IT8720F. Signed-off-by: Jean Delvare <khali@linux-fr.org> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-rw-r--r--drivers/hwmon/it87.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c
index 9157247fed8e..231a6a5d6d70 100644
--- a/drivers/hwmon/it87.c
+++ b/drivers/hwmon/it87.c
@@ -1028,12 +1028,11 @@ static int __init it87_find(unsigned short *address,
chip_type, *address, sio_data->revision);
/* Read GPIO config and VID value from LDN 7 (GPIO) */
- if (chip_type != IT8705F_DEVID) {
+ if (sio_data->type != it87) {
int reg;
superio_select(GPIO);
- if ((chip_type == it8718) ||
- (chip_type == it8720))
+ if (sio_data->type == it8718 || sio_data->type == it8720)
sio_data->vid_value = superio_inb(IT87_SIO_VID_REG);
reg = superio_inb(IT87_SIO_PINX2_REG);