From cab9d3e19b4ac5df5a59ccae27ebb8da6078b197 Mon Sep 17 00:00:00 2001 From: Jean Delvare Date: Sun, 17 Jun 2007 16:09:12 +0200 Subject: [PATCH] --- yaml --- r: 61801 b: refs/heads/master c: 158ce07564b68d4215b9560213a089d6f7c5a4ea h: refs/heads/master i: 61799: 5d82cee17948c917921e2a786f3dc95358a9732b v: v3 --- [refs] | 2 +- trunk/drivers/hwmon/w83627ehf.c | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e0ae87ba09a9..a65798cfdbd1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e432dc811bfb6b3d3ad618d99bd8d58132fec316 +refs/heads/master: 158ce07564b68d4215b9560213a089d6f7c5a4ea diff --git a/trunk/drivers/hwmon/w83627ehf.c b/trunk/drivers/hwmon/w83627ehf.c index 30a76404f0af..f4d850c71585 100644 --- a/trunk/drivers/hwmon/w83627ehf.c +++ b/trunk/drivers/hwmon/w83627ehf.c @@ -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 fan min (unconditionally) */ if (new_div != data->fan_div[nr]) { - if (new_div > data->fan_div[nr]) - data->fan[nr] >>= (data->fan_div[nr] - new_div); - else - data->fan[nr] <<= (new_div - data->fan_div[nr]); + /* Preserve the fan speed reading */ + if (data->fan[nr] != 0xff) { + if (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", nr + 1, div_from_reg(data->fan_div[nr]),