forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

hwmon/w83627ehf: Preserve speed reading when changing fan min

Browse source 
The w83627ehf driver changes the fan clock divider automatically when
a new min fan speed is set. It is supposed to preserve the fan speed
reading while doing so, bug doesn't really. Fix it.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Mark M. Hoffman <mhoffman@lightlink.com>
This commit is contained in:
Jean Delvare 2007-06-17 16:09:12 +02:00 • committed by Mark M. Hoffman
parent e432dc811b
commit 158ce07564
1 changed files with 9 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
drivers/hwmon/w83627ehf.c
View file

@ -716,10 +716,15 @@ store_fan_min(struct device *dev, struct device_attribute *attr,
/* Write both the fan clock divider (if it changed) and the new /* Write both the fan clock divider (if it changed) and the new
fan min (unconditionally) */ fan min (unconditionally) */
if (new_div != data->fan_div[nr]) { if (new_div != data->fan_div[nr]) {
if (new_div > data->fan_div[nr]) /* Preserve the fan speed reading */
data->fan[nr] >>= (data->fan_div[nr] - new_div); if (data->fan[nr] != 0xff) {
else if (new_div > data->fan_div[nr])
data->fan[nr] <<= (new_div - data->fan_div[nr]); data->fan[nr] >>= new_div - data->fan_div[nr];
else if (data->fan[nr] & 0x80)
data->fan[nr] = 0xff;
else
data->fan[nr] <<= data->fan_div[nr] - new_div;
}
dev_dbg(dev, "fan%u clock divider changed from %u to %u\n", dev_dbg(dev, "fan%u clock divider changed from %u to %u\n",
nr + 1, div_from_reg(data->fan_div[nr]), nr + 1, div_from_reg(data->fan_div[nr]),