Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'hwmon-fixes-for-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
One patch to fix fan detection on NCT6776F.
* tag 'hwmon-fixes-for-3.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (w83627ehf) Fix number of fans for NCT6776F
+20
-3
+20
-3
drivers/hwmon/w83627ehf.c
+20
-3
drivers/hwmon/w83627ehf.c
···
1920
1920
fan4min = 0;
1921
1921
fan5pin = 0;
1922
1922
} else if (sio_data->kind == nct6776) {
1923
-
fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40);
1924
-
fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x01);
1925
-
fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x02);
1923
+
bool gpok = superio_inb(sio_data->sioreg, 0x27) & 0x80;
1924
+
1925
+
superio_select(sio_data->sioreg, W83627EHF_LD_HWM);
1926
+
regval = superio_inb(sio_data->sioreg, SIO_REG_ENABLE);
1927
+
1928
+
if (regval & 0x80)
1929
+
fan3pin = gpok;
1930
+
else
1931
+
fan3pin = !(superio_inb(sio_data->sioreg, 0x24) & 0x40);
1932
+
1933
+
if (regval & 0x40)
1934
+
fan4pin = gpok;
1935
+
else
1936
+
fan4pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x01);
1937
+
1938
+
if (regval & 0x20)
1939
+
fan5pin = gpok;
1940
+
else
1941
+
fan5pin = !!(superio_inb(sio_data->sioreg, 0x1C) & 0x02);
1942
+
1926
1943
fan4min = fan4pin;
1927
1944
} else if (sio_data->kind == w83667hg || sio_data->kind == w83667hg_b) {
1928
1945
fan3pin = 1;