diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-06 15:32:40 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-01-06 15:32:40 -0800 |
| commit | baaf031521b7f67be45f07593023b6ba47f07d15 (patch) | |
| tree | 1d04b78d22e1149bec3c0ce8f72de46f3032ca1d | |
| parent | 08289086b0ab0379f54e1590ceb5e1b04d239c07 (diff) | |
| parent | e9572fdd13e299cfba03abbfd2786c84ac055249 (diff) | |
| download | linux-baaf031521b7f67be45f07593023b6ba47f07d15.tar.gz linux-baaf031521b7f67be45f07593023b6ba47f07d15.tar.bz2 linux-baaf031521b7f67be45f07593023b6ba47f07d15.zip | |
Merge tag 'hwmon-for-linus-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
Pull hwmon fix from Guenter Roeck:
"Fix temp1_max_alarm attribute in lm90 driver"
* tag 'hwmon-for-linus-v4.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (lm90) fix temp1_max_alarm attribute
| -rw-r--r-- | drivers/hwmon/lm90.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/lm90.c b/drivers/hwmon/lm90.c index 322ed9272811..841f2428e84a 100644 --- a/drivers/hwmon/lm90.c +++ b/drivers/hwmon/lm90.c @@ -1036,7 +1036,7 @@ static const u8 lm90_temp_emerg_index[3] = { }; static const u8 lm90_min_alarm_bits[3] = { 5, 3, 11 }; -static const u8 lm90_max_alarm_bits[3] = { 0, 4, 12 }; +static const u8 lm90_max_alarm_bits[3] = { 6, 4, 12 }; static const u8 lm90_crit_alarm_bits[3] = { 0, 1, 9 }; static const u8 lm90_emergency_alarm_bits[3] = { 15, 13, 14 }; static const u8 lm90_fault_bits[3] = { 0, 2, 10 }; |