summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorAxel Lin <axel.lin@ingics.com>2014-07-31 16:27:04 +0200
committerGuenter Roeck <linux@roeck-us.net>2014-08-04 18:15:46 +0200
commitcc336546ddca8c22de83720632431c16a5f9fe9a (patch)
tree69eab7de004aca92f6898b7c90df49be0f1172be /drivers/hwmon
parenthwmon: (gpio-fan) Prevent overflow problem when writing large limits (diff)
downloadlinux-cc336546ddca8c22de83720632431c16a5f9fe9a.tar.xz
linux-cc336546ddca8c22de83720632431c16a5f9fe9a.zip
hwmon: (sis5595) Prevent overflow problem when writing large limits
On platforms with sizeof(int) < sizeof(long), writing a temperature limit larger than MAXINT will result in unpredictable limit values written to the chip. Avoid auto-conversion from long to int to fix the problem. Signed-off-by: Axel Lin <axel.lin@ingics.com> Cc: stable@vger.kernel.org Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/sis5595.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/sis5595.c b/drivers/hwmon/sis5595.c
index 3532026e25da..bf1d7893d51c 100644
--- a/drivers/hwmon/sis5595.c
+++ b/drivers/hwmon/sis5595.c
@@ -159,7 +159,7 @@ static inline int TEMP_FROM_REG(s8 val)
{
return val * 830 + 52120;
}
-static inline s8 TEMP_TO_REG(int val)
+static inline s8 TEMP_TO_REG(long val)
{
int nval = clamp_val(val, -54120, 157530) ;
return nval < 0 ? (nval - 5212 - 415) / 830 : (nval - 5212 + 415) / 830;