diff options
| author | Mark Brown <broonie@linaro.org> | 2014-07-14 10:45:20 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-07-14 10:45:20 +0100 |
| commit | fa6e05294759c29b3736010aa386928d24715feb (patch) | |
| tree | 3d75b2933fe5d5dbcfb2983d5147f8867bc0157a /drivers/hwmon | |
| parent | 49bcf50125c661f45a030edd1a241917f1c7a821 (diff) | |
| parent | d93efdcd512a5b663cfb2da04afabd74af5d95b6 (diff) | |
Merge tag 'v3.10.48' into linux-linaro-lsk
This is the 3.10.48 stable release
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/ina2xx.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/hwmon/ina2xx.c b/drivers/hwmon/ina2xx.c index 4958b2f89dce..371c1ee233b7 100644 --- a/drivers/hwmon/ina2xx.c +++ b/drivers/hwmon/ina2xx.c @@ -147,7 +147,8 @@ static int ina2xx_get_value(struct ina2xx_data *data, u8 reg) switch (reg) { 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); break; case INA2XX_BUS_VOLTAGE: @@ -159,8 +160,8 @@ static int ina2xx_get_value(struct ina2xx_data *data, u8 reg) val = data->regs[reg] * data->config->power_lsb; break; case INA2XX_CURRENT: - /* LSB=1mA (selected). Is in mA */ - val = data->regs[reg]; + /* signed register, LSB=1mA (selected), in mA */ + val = (s16)data->regs[reg]; break; default: /* programmer goofed */ |