summaryrefslogtreecommitdiffstats
path: root/drivers/hwmon
diff options
context:
space:
mode:
authorJoe Schaack <jschaack@xes-inc.com>2017-04-18 07:15:50 -0500
committerGuenter Roeck <linux@roeck-us.net>2017-04-21 12:30:09 -0700
commitbdaf9c40b2d1d67617b259c59ce1858eda54b4ce (patch)
tree2126071904a9252f1d2bea87cfc61e3631786ff2 /drivers/hwmon
parenta02c24a321583e7970393488834501e15a69b656 (diff)
downloadlinux-bdaf9c40b2d1d67617b259c59ce1858eda54b4ce.tar.bz2
hwmon: (ina209) Handled signed registers
The shunt voltage and current registers are signed 16-bit values so handle them as such. Signed-off-by: Joe Schaack <jschaack@xes-inc.com> Reviewed-by: Aaron Sierra <asierra@xes-inc.com> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Diffstat (limited to 'drivers/hwmon')
-rw-r--r--drivers/hwmon/ina209.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/hwmon/ina209.c b/drivers/hwmon/ina209.c
index c5f20f03e0be..aa0768ce8aea 100644
--- a/drivers/hwmon/ina209.c
+++ b/drivers/hwmon/ina209.c
@@ -117,7 +117,7 @@ static long ina209_from_reg(const u8 reg, const u16 val)
case INA209_SHUNT_VOLTAGE_POS_WARN:
case INA209_SHUNT_VOLTAGE_NEG_WARN:
/* LSB=10 uV. Convert to mV. */
- return DIV_ROUND_CLOSEST(val, 100);
+ return DIV_ROUND_CLOSEST((s16)val, 100);
case INA209_BUS_VOLTAGE:
case INA209_BUS_VOLTAGE_MAX_PEAK:
@@ -146,7 +146,7 @@ static long ina209_from_reg(const u8 reg, const u16 val)
case INA209_CURRENT:
/* LSB=1 mA (selected). Is in mA */
- return val;
+ return (s16)val;
}
/* programmer goofed */