diff options
| author | Nikolaus Schulz <schulz@macnetix.de> | 2012-02-08 18:56:11 +0100 |
|---|---|---|
| committer | Guenter Roeck <guenter.roeck@ericsson.com> | 2012-02-09 11:21:49 -0800 |
| commit | a1c1baf00e5c08dda9c0ee25658bf0ce301102ae (patch) | |
| tree | 108c402ec1768118839ef9e245b3806c82929734 /drivers/hwmon/f75375s.c | |
| parent | eb2f255b2d360df3f500042a2258dcf2fcbe89a2 (diff) | |
| download | linux-3.10-a1c1baf00e5c08dda9c0ee25658bf0ce301102ae.tar.gz linux-3.10-a1c1baf00e5c08dda9c0ee25658bf0ce301102ae.tar.bz2 linux-3.10-a1c1baf00e5c08dda9c0ee25658bf0ce301102ae.zip | |
hwmon: (f75375s) Let f75375_update_device treat pwmX as a measured value
Treat pwmX as a measured value, not as a (mostly static) limit value, so
that it is updated more frequently from the device register.
Signed-off-by: Nikolaus Schulz <mail@microschulz.de>
Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Diffstat (limited to 'drivers/hwmon/f75375s.c')
| -rw-r--r-- | drivers/hwmon/f75375s.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/hwmon/f75375s.c b/drivers/hwmon/f75375s.c index 0aabaaf359a..f609b5727ba 100644 --- a/drivers/hwmon/f75375s.c +++ b/drivers/hwmon/f75375s.c @@ -200,9 +200,6 @@ static struct f75375_data *f75375_update_device(struct device *dev) f75375_read16(client, F75375_REG_FAN_MIN(nr)); data->fan_target[nr] = f75375_read16(client, F75375_REG_FAN_EXP(nr)); - data->pwm[nr] = f75375_read8(client, - F75375_REG_FAN_PWM_DUTY(nr)); - } for (nr = 0; nr < 4; nr++) { data->in_max[nr] = @@ -218,6 +215,8 @@ static struct f75375_data *f75375_update_device(struct device *dev) if (time_after(jiffies, data->last_updated + 2 * HZ) || !data->valid) { for (nr = 0; nr < 2; nr++) { + data->pwm[nr] = f75375_read8(client, + F75375_REG_FAN_PWM_DUTY(nr)); /* assign MSB, therefore shift it by 8 bits */ data->temp11[nr] = f75375_read8(client, F75375_REG_TEMP(nr)) << 8; |