diff options
| author | Nikolaus Schulz <schulz@macnetix.de> | 2012-02-22 23:18:44 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-29 16:34:33 -0800 |
| commit | 809a6d6fddb556579e651ad1fb652d6012f8a102 (patch) | |
| tree | 1efdea7e0badf3b77eb98085b521516f3e94c0b6 /drivers/hwmon | |
| parent | c79db0b57006fddace56ac038e7340bdea18077b (diff) | |
| download | kernel_samsung_smdk4412-809a6d6fddb556579e651ad1fb652d6012f8a102.zip kernel_samsung_smdk4412-809a6d6fddb556579e651ad1fb652d6012f8a102.tar.gz kernel_samsung_smdk4412-809a6d6fddb556579e651ad1fb652d6012f8a102.tar.bz2 | |
hwmon: (f75375s) Fix register write order when setting fans to full speed
commit c1c1a3d012fe5e82a9a025fb4b5a4f8ee67a53f6 upstream.
By hwmon sysfs interface convention, setting pwm_enable to zero sets a fan
to full speed. In the f75375s driver, this need be done by enabling
manual fan control, plus duty mode for the F875387 chip, and then setting
the maximum duty cycle. Fix a bug where the two necessary register writes
were swapped, effectively discarding the setting to full-speed.
Signed-off-by: Nikolaus Schulz <mail@microschulz.de>
Cc: Riku Voipio <riku.voipio@iki.fi>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/f75375s.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c index e4ab491..040a820 100644 --- a/drivers/hwmon/f75375s.c +++ b/drivers/hwmon/f75375s.c @@ -304,8 +304,6 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val) case 0: /* Full speed */ fanmode |= (3 << FAN_CTRL_MODE(nr)); data->pwm[nr] = 255; - f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr), - data->pwm[nr]); break; case 1: /* PWM */ fanmode |= (3 << FAN_CTRL_MODE(nr)); @@ -318,6 +316,9 @@ static int set_pwm_enable_direct(struct i2c_client *client, int nr, int val) } f75375_write8(client, F75375_REG_FAN_TIMER, fanmode); data->pwm_enable[nr] = val; + if (val == 0) + f75375_write8(client, F75375_REG_FAN_PWM_DUTY(nr), + data->pwm[nr]); return 0; } |