Commit c0214f98 authored by Fabio Baltieri's avatar Fabio Baltieri Committed by Guenter Roeck

hwmon: (ina2xx) Cast to s16 on shunt and current regs

All devices supported by ina2xx are bidirectional and report the
measured shunt voltage and power values as a signed 16 bit, but the
current driver implementation caches all registers as u16, leading
to an incorrect sign extension when reporting to userspace in
ina2xx_get_value().

This patch fixes the problem by casting the signed registers to s16.
Tested on an INA219.
Signed-off-by: default avatarFabio Baltieri <fabio.baltieri@gmail.com>
Cc: stable@vger.kernel.org # 3.10+
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
parent 5c02c392
...@@ -148,7 +148,8 @@ static int ina2xx_get_value(struct ina2xx_data *data, u8 reg) ...@@ -148,7 +148,8 @@ static int ina2xx_get_value(struct ina2xx_data *data, u8 reg)
switch (reg) { switch (reg) {
case INA2XX_SHUNT_VOLTAGE: case INA2XX_SHUNT_VOLTAGE:
val = DIV_ROUND_CLOSEST(data->regs[reg], /* signed register */
val = DIV_ROUND_CLOSEST((s16)data->regs[reg],
data->config->shunt_div); data->config->shunt_div);
break; break;
case INA2XX_BUS_VOLTAGE: case INA2XX_BUS_VOLTAGE:
...@@ -160,8 +161,8 @@ static int ina2xx_get_value(struct ina2xx_data *data, u8 reg) ...@@ -160,8 +161,8 @@ static int ina2xx_get_value(struct ina2xx_data *data, u8 reg)
val = data->regs[reg] * data->config->power_lsb; val = data->regs[reg] * data->config->power_lsb;
break; break;
case INA2XX_CURRENT: case INA2XX_CURRENT:
/* LSB=1mA (selected). Is in mA */ /* signed register, LSB=1mA (selected), in mA */
val = data->regs[reg]; val = (s16)data->regs[reg];
break; break;
default: default:
/* programmer goofed */ /* programmer goofed */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment