diff options
| author | Peter Rosin <peda@axentia.se> | 2016-02-18 14:07:52 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2016-03-03 15:07:25 -0800 |
| commit | 5c2bd0c61ca8a5af85370c71f9c7e05e1e434132 (patch) | |
| tree | 4e4d1b856f431eb86fb0c26adc129a9baf89cac2 /drivers/hwmon | |
| parent | 4bbd7acd014a4432b8d15372840184dce62b1002 (diff) | |
| download | linux-stable-5c2bd0c61ca8a5af85370c71f9c7e05e1e434132.tar.gz linux-stable-5c2bd0c61ca8a5af85370c71f9c7e05e1e434132.tar.bz2 linux-stable-5c2bd0c61ca8a5af85370c71f9c7e05e1e434132.zip | |
hwmon: (ads1015) Handle negative conversion values correctly
commit acc146943957d7418a6846f06e029b2c5e87e0d5 upstream.
Make the divisor signed as DIV_ROUND_CLOSEST is undefined for negative
dividends when the divisor is unsigned.
Signed-off-by: Peter Rosin <peda@axentia.se>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/ads1015.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c index f155b8380481..2b3105c8aed3 100644 --- a/drivers/hwmon/ads1015.c +++ b/drivers/hwmon/ads1015.c @@ -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); unsigned int pga = data->channel_data[channel].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); } |