Merge tag 'rtc-4.10' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux

[linux-2.6-block.git] / drivers / hwmon / adm9240.c

diff --git a/drivers/hwmon/adm9240.c b/drivers/hwmon/adm9240.c
index 2fe1828bd10b79fc18f1dfbe1f2e0e9c00e99cd3..72bf2489511e132be2311b7f8a69bfdf36ba0153 100644 (file)
--- a/drivers/hwmon/adm9240.c
+++ b/drivers/hwmon/adm9240.c
@@ -98,13 +98,15 @@ static inline unsigned int IN_FROM_REG(u8 reg, int n)
 
 static inline u8 IN_TO_REG(unsigned long val, int n)
 {
-       return clamp_val(SCALE(val, 192, nom_mv[n]), 0, 255);
+       val = clamp_val(val, 0, nom_mv[n] * 255 / 192);
+       return SCALE(val, 192, nom_mv[n]);
 }
 
 /* temperature range: -40..125, 127 disables temperature alarm */
 static inline s8 TEMP_TO_REG(long val)
 {
-       return clamp_val(SCALE(val, 1, 1000), -40, 127);
+       val = clamp_val(val, -40000, 127000);
+       return SCALE(val, 1, 1000);
 }
 
 /* two fans, each with low fan speed limit */
@@ -122,7 +124,8 @@ static inline unsigned int FAN_FROM_REG(u8 reg, u8 div)
 /* analog out 0..1250mV */
 static inline u8 AOUT_TO_REG(unsigned long val)
 {
-       return clamp_val(SCALE(val, 255, 1250), 0, 255);
+       val = clamp_val(val, 0, 1250);
+       return SCALE(val, 255, 1250);
 }
 
 static inline unsigned int AOUT_FROM_REG(u8 reg)