diff options
| author | Brian Carnes <bmcarnes@gmail.com> | 2013-12-12 08:05:32 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@endymion.delvare> | 2013-12-12 08:05:32 +0100 |
| commit | cf7559bc053471f32373d71d04a9aa19e0b48d59 (patch) | |
| tree | 6bec0dc9466ff39f33d0b98d3cc3a9fa677a07ae /drivers/hwmon/w83l786ng.c | |
| parent | 3d489ac07ed85c4908d864abb77ab1e6f94e0e4b (diff) | |
| download | blackbird-obmc-linux-cf7559bc053471f32373d71d04a9aa19e0b48d59.tar.gz blackbird-obmc-linux-cf7559bc053471f32373d71d04a9aa19e0b48d59.zip | |
hwmon: (w83l786ng) Fix fan speed control mode setting and reporting
The wrong mask is used, which causes some fan speed control modes
(pwmX_enable) to be incorrectly reported, and some modes to be
impossible to set.
[JD: add subject and description.]
Signed-off-by: Brian Carnes <bmcarnes@gmail.com>
Cc: stable@vger.kernel.org
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon/w83l786ng.c')
| -rw-r--r-- | drivers/hwmon/w83l786ng.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/w83l786ng.c b/drivers/hwmon/w83l786ng.c index edb06cda5a68..f190219fa84d 100644 --- a/drivers/hwmon/w83l786ng.c +++ b/drivers/hwmon/w83l786ng.c @@ -510,7 +510,7 @@ store_pwm_enable(struct device *dev, struct device_attribute *attr, mutex_lock(&data->update_lock); reg = w83l786ng_read_value(client, W83L786NG_REG_FAN_CFG); data->pwm_enable[nr] = val; - reg &= ~(0x02 << W83L786NG_PWM_ENABLE_SHIFT[nr]); + reg &= ~(0x03 << W83L786NG_PWM_ENABLE_SHIFT[nr]); reg |= (val - 1) << W83L786NG_PWM_ENABLE_SHIFT[nr]; w83l786ng_write_value(client, W83L786NG_REG_FAN_CFG, reg); mutex_unlock(&data->update_lock); @@ -776,7 +776,7 @@ static struct w83l786ng_data *w83l786ng_update_device(struct device *dev) ((pwmcfg >> W83L786NG_PWM_MODE_SHIFT[i]) & 1) ? 0 : 1; data->pwm_enable[i] = - ((pwmcfg >> W83L786NG_PWM_ENABLE_SHIFT[i]) & 2) + 1; + ((pwmcfg >> W83L786NG_PWM_ENABLE_SHIFT[i]) & 3) + 1; data->pwm[i] = w83l786ng_read_value(client, W83L786NG_REG_PWM[i]); } |
