The following commit has been merged in the linux branch: commit 371dc4a6d8c3c74a9a1c74b87c2affb3fcef6500 Author: Jean Delvare khali@linux-fr.org Date: Sat Oct 24 13:28:47 2009 +0200

hwmon: (it87) Fix VID reading on IT8718F/IT8720F

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

diff --git a/drivers/hwmon/it87.c b/drivers/hwmon/it87.c index ffeb2a1..a3749cb 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);