summaryrefslogtreecommitdiff
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2012-01-20 10:09:23 -0500
committerGuenter Roeck <guenter.roeck@ericsson.com>2012-01-20 09:05:35 -0800
commit86b2bbfdbd1fcc4a3aa62ccd3f245c40c5ad5b85 (patch)
tree7507ea89b03997fc955eb781f9a4347f353796bb /drivers/hwmon
parentdcd6c92267155e70a94b3927bce681ce74b80d1f (diff)
downloadlinux-3.10-86b2bbfdbd1fcc4a3aa62ccd3f245c40c5ad5b85.tar.gz
linux-3.10-86b2bbfdbd1fcc4a3aa62ccd3f245c40c5ad5b85.tar.bz2
linux-3.10-86b2bbfdbd1fcc4a3aa62ccd3f245c40c5ad5b85.zip
hwmon: (f71805f) Fix clamping of temperature limits
Properly clamp temperature limits set by the user. Without this fix, attempts to write temperature limits above the maximum supported by the chip (255 degrees Celsius) would arbitrarily and unexpectedly result in the limit being set to 0 degree Celsius. Signed-off-by: Jean Delvare <khali@linux-fr.org> Cc: stable@vger.kernel.org Signed-off-by: Guenter Roeck <guenter.roeck@ericsson.com>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/f71805f.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/hwmon/f71805f.c b/drivers/hwmon/f71805f.c
index 92f949767ec..6dbfd3e516e 100644
--- a/drivers/hwmon/f71805f.c
+++ b/drivers/hwmon/f71805f.c
@@ -283,11 +283,11 @@ static inline long temp_from_reg(u8 reg)
static inline u8 temp_to_reg(long val)
{
- if (val < 0)
- val = 0;
- else if (val > 1000 * 0xff)
- val = 0xff;
- return ((val + 500) / 1000);
+ if (val <= 0)
+ return 0;
+ if (val >= 1000 * 0xff)
+ return 0xff;
+ return (val + 500) / 1000;
}
/*