summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorNicolin Chen <nicoleotsuka@gmail.com>2018-11-13 19:48:54 -0800
committerGuenter Roeck <linux@roeck-us.net>2018-11-14 09:11:24 -0800
commit38cd989ee38c16388cde89db5b734f9d55b905f9 (patch)
tree25f99e7cc6454e8ad3d89a1c29b6cf4aab5803cb /drivers
parent35fdc3902179366489a12cae4cb3ccc3b95f0afe (diff)
downloadlinux-stable-38cd989ee38c16388cde89db5b734f9d55b905f9.tar.gz
linux-stable-38cd989ee38c16388cde89db5b734f9d55b905f9.tar.bz2
linux-stable-38cd989ee38c16388cde89db5b734f9d55b905f9.zip
hwmon: (ina2xx) Fix current value calculation
The current register (04h) has a sign bit at MSB. The comments for this calculation also mention that it's a signed register. However, the regval is unsigned type so result of calculation turns out to be an incorrect value when current is negative. This patch simply fixes this by adding a casting to s16. Fixes: 5d389b125186c ("hwmon: (ina2xx) Make calibration register value fixed") Signed-off-by: Nicolin Chen <nicoleotsuka@gmail.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/hwmon/ina2xx.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c
index c2252cf452f5..07ee19573b3f 100644
--- a/drivers/hwmon/ina2xx.c
+++ b/drivers/hwmon/ina2xx.c
@@ -274,7 +274,7 @@ static int ina2xx_get_value(struct ina2xx_data *data, u8 reg,
break;
case INA2XX_CURRENT:
/* signed register, result in mA */
- val = regval * data->current_lsb_uA;
+ val = (s16)regval * data->current_lsb_uA;
val = DIV_ROUND_CLOSEST(val, 1000);
break;
case INA2XX_CALIBRATION: