Commit 788ad9e6 authored by Peter Rosin's avatar Peter Rosin Committed by Luis Henriques

hwmon: (ads1015) Handle negative conversion values correctly

commit acc14694 upstream.

Make the divisor signed as DIV_ROUND_CLOSEST is undefined for negative
dividends when the divisor is unsigned.
Signed-off-by: default avatarPeter Rosin <peda@axentia.se>
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 3e7c5928
...@@ -126,7 +126,7 @@ static int ads1015_reg_to_mv(struct i2c_client *client, unsigned int channel, ...@@ -126,7 +126,7 @@ static int ads1015_reg_to_mv(struct i2c_client *client, unsigned int channel,
struct ads1015_data *data = i2c_get_clientdata(client); struct ads1015_data *data = i2c_get_clientdata(client);
unsigned int pga = data->channel_data[channel].pga; unsigned int pga = data->channel_data[channel].pga;
int fullscale = fullscale_table[pga]; int fullscale = fullscale_table[pga];
const unsigned mask = data->id == ads1115 ? 0x7fff : 0x7ff0; const int mask = data->id == ads1115 ? 0x7fff : 0x7ff0;
return DIV_ROUND_CLOSEST(reg * fullscale, mask); return DIV_ROUND_CLOSEST(reg * fullscale, mask);
} }
......
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