projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
hwmon: (w83627ehf) Invert fan pin variables logic
[linux-2.6-block.git]
/
drivers
/
hwmon
/
w83627ehf.c
diff --git
a/drivers/hwmon/w83627ehf.c
b/drivers/hwmon/w83627ehf.c
index feae743ba99163c2475b0f51663c89fc7e7f1375..18432e34dc7aa9ccbd7568cb53d70a57e44e8d3b 100644
(file)
--- a/
drivers/hwmon/w83627ehf.c
+++ b/
drivers/hwmon/w83627ehf.c
@@
-1317,8
+1317,8
@@
static int __devinit w83627ehf_probe(struct platform_device *pdev)
/* fan4 and fan5 share some pins with the GPIO and serial flash */
/* fan4 and fan5 share some pins with the GPIO and serial flash */
- fan5pin =
superio_inb(sio_data->sioreg, 0x24) & 0x2
;
- fan4pin =
superio_inb(sio_data->sioreg, 0x29) & 0x6
;
+ fan5pin =
!(superio_inb(sio_data->sioreg, 0x24) & 0x2)
;
+ fan4pin =
!(superio_inb(sio_data->sioreg, 0x29) & 0x6)
;
superio_exit(sio_data->sioreg);
/* It looks like fan4 and fan5 pins can be alternatively used
superio_exit(sio_data->sioreg);
/* It looks like fan4 and fan5 pins can be alternatively used
@@
-1329,9
+1329,9
@@
static int __devinit w83627ehf_probe(struct platform_device *pdev)
data->has_fan = 0x07; /* fan1, fan2 and fan3 */
i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV1);
data->has_fan = 0x07; /* fan1, fan2 and fan3 */
i = w83627ehf_read_value(data, W83627EHF_REG_FANDIV1);
- if ((i & (1 << 2)) &&
(!fan4pin)
)
+ if ((i & (1 << 2)) &&
fan4pin
)
data->has_fan |= (1 << 3);
data->has_fan |= (1 << 3);
- if (!(i & (1 << 1)) &&
(!fan5pin)
)
+ if (!(i & (1 << 1)) &&
fan5pin
)
data->has_fan |= (1 << 4);
/* Read fan clock dividers immediately */
data->has_fan |= (1 << 4);
/* Read fan clock dividers immediately */