diff options
| author | Nicolin Chen <nicoleotsuka@gmail.com> | 2018-11-13 19:48:54 -0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2018-12-17 09:28:48 +0100 |
| commit | fd2c1ba142277bfd6f3488e6105c9eb643246ddc (patch) | |
| tree | c18b997009a9e2085f8fb4a61c4d51daab97458b | |
| parent | 250dea0dfb12e2803d6de0105fae7177e4bd1b80 (diff) | |
| download | linux-stable-fd2c1ba142277bfd6f3488e6105c9eb643246ddc.tar.gz linux-stable-fd2c1ba142277bfd6f3488e6105c9eb643246ddc.tar.bz2 linux-stable-fd2c1ba142277bfd6f3488e6105c9eb643246ddc.zip | |
hwmon: (ina2xx) Fix current value calculation
[ Upstream commit 38cd989ee38c16388cde89db5b734f9d55b905f9 ]
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>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/hwmon/ina2xx.c | 2 |
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: |