diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-23 03:43:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-23 03:43:31 -0400 |
| commit | 5117cc25fd43add94c04c9d2ace713c69a21bdb1 (patch) | |
| tree | 866ee03e42337edbc1cd41d0e761ca82d0806c83 /drivers | |
| parent | 2efd7c0fdcbe041173e248ccc2d9c91df7f84ce5 (diff) | |
| parent | 133d324d82e144588939ad25b732b5b6c33b03d9 (diff) | |
Merge branch 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging
* 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
hwmon: (w83627ehf) Fix negative 8-bit temperature values
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/hwmon/w83627ehf.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/hwmon/w83627ehf.c b/drivers/hwmon/w83627ehf.c index 7b0260dc76fb..36d7f270b14d 100644 --- a/drivers/hwmon/w83627ehf.c +++ b/drivers/hwmon/w83627ehf.c | |||
| @@ -390,7 +390,7 @@ temp_from_reg(u16 reg, s16 regval) | |||
| 390 | { | 390 | { |
| 391 | if (is_word_sized(reg)) | 391 | if (is_word_sized(reg)) |
| 392 | return LM75_TEMP_FROM_REG(regval); | 392 | return LM75_TEMP_FROM_REG(regval); |
| 393 | return regval * 1000; | 393 | return ((s8)regval) * 1000; |
| 394 | } | 394 | } |
| 395 | 395 | ||
| 396 | static inline u16 | 396 | static inline u16 |
| @@ -398,7 +398,8 @@ temp_to_reg(u16 reg, long temp) | |||
| 398 | { | 398 | { |
| 399 | if (is_word_sized(reg)) | 399 | if (is_word_sized(reg)) |
| 400 | return LM75_TEMP_TO_REG(temp); | 400 | return LM75_TEMP_TO_REG(temp); |
| 401 | return DIV_ROUND_CLOSEST(SENSORS_LIMIT(temp, -127000, 128000), 1000); | 401 | return (s8)DIV_ROUND_CLOSEST(SENSORS_LIMIT(temp, -127000, 128000), |
| 402 | 1000); | ||
| 402 | } | 403 | } |
| 403 | 404 | ||
| 404 | /* Some of analog inputs have internal scaling (2x), 8mV is ADC LSB */ | 405 | /* Some of analog inputs have internal scaling (2x), 8mV is ADC LSB */ |