]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
hwmon/w83627ehf: Fix the fan5 clock divider write
authorJean Delvare <khali@linux-fr.org>
Wed, 25 Apr 2007 07:51:01 +0000 (09:51 +0200)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 2 May 2007 00:06:02 +0000 (17:06 -0700)
Users have been complaining about the w83627ehf driver flooding their
logs with debug messages like:

w83627ehf 9191-0a10: Increasing fan 4 clock divider from 64 to 128

or:

w83627ehf 9191-0290: Increasing fan 4 clock divider from 4 to 8

The reason is that we failed to actually write the LSB of the encoded
clock divider value for that fan, causing the next read to report the
same old value again and again.

Additionally, the fan number was improperly reported, making the bug
harder to find.

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/hwmon/w83627ehf.c

index 212a1558c63b62a0556f469f1370341e9c14b039..b9d5dd407dc3849b41f577d016b3f61e75fa0a0b 100644 (file)
@@ -389,7 +389,7 @@ static void w83627ehf_write_fan_div(struct i2c_client *client, int nr)
                break;
        case 4:
                reg = (w83627ehf_read_value(client, W83627EHF_REG_DIODE) & 0x73)
-                   | ((data->fan_div[4] & 0x03) << 3)
+                   | ((data->fan_div[4] & 0x03) << 2)
                    | ((data->fan_div[4] & 0x04) << 5);
                w83627ehf_write_value(client, W83627EHF_REG_DIODE, reg);
                break;
@@ -453,9 +453,9 @@ static struct w83627ehf_data *w83627ehf_update_device(struct device *dev)
                           time */
                        if (data->fan[i] == 0xff
                         && data->fan_div[i] < 0x07) {
-                               dev_dbg(&client->dev, "Increasing fan %d "
+                               dev_dbg(&client->dev, "Increasing fan%d "
                                        "clock divider from %u to %u\n",
-                                       i, div_from_reg(data->fan_div[i]),
+                                       i + 1, div_from_reg(data->fan_div[i]),
                                        div_from_reg(data->fan_div[i] + 1));
                                data->fan_div[i]++;
                                w83627ehf_write_fan_div(client, i);