diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-25 12:12:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-02-25 12:12:08 -0800 |
| commit | 00b10ecf2d75664cc1bdf702e0412e34a1f94b22 (patch) | |
| tree | b3d3874d64793660b8982f956f0aef452cf52af4 /drivers/hwmon/pmbus/max34440.c | |
| parent | 1e73fde581e2d34c4ff04eb10671711845c79bad (diff) | |
| parent | dc91ad8e84593eb49c65cca70537088782b21e08 (diff) | |
| download | linux-3.10-00b10ecf2d75664cc1bdf702e0412e34a1f94b22.tar.gz linux-3.10-00b10ecf2d75664cc1bdf702e0412e34a1f94b22.tar.bz2 linux-3.10-00b10ecf2d75664cc1bdf702e0412e34a1f94b22.zip | |
Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Couple of minor driver fixes.
* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (max34440) Fix resetting temperature history
hwmon: (f75375s) Fix register write order when setting fans to full speed
hwmon: (ads1015) Fix file leak in probe function
hwmon: (max6639) Fix PPR register initialization to set both channels
hwmon: (max6639) Fix FAN_FROM_REG calculation
Diffstat (limited to 'drivers/hwmon/pmbus/max34440.c')
| -rw-r--r-- | drivers/hwmon/pmbus/max34440.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/pmbus/max34440.c b/drivers/hwmon/pmbus/max34440.c index beaf5a8d9c4..9b97a5b3cf3 100644 --- a/drivers/hwmon/pmbus/max34440.c +++ b/drivers/hwmon/pmbus/max34440.c @@ -82,7 +82,7 @@ static int max34440_write_word_data(struct i2c_client *client, int page, case PMBUS_VIRT_RESET_TEMP_HISTORY: ret = pmbus_write_word_data(client, page, MAX34440_MFR_TEMPERATURE_PEAK, - 0xffff); + 0x8000); break; default: ret = -ENODATA; |