From: Peter Rosin Date: Thu, 18 Feb 2016 13:07:52 +0000 (+0100) Subject: hwmon: (ads1015) Handle negative conversion values correctly X-Git-Tag: v4.1.20~70 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9077dc77a92526b028111db2943a26ff8e475d03;p=platform%2Fkernel%2Flinux-exynos.git hwmon: (ads1015) Handle negative conversion values correctly [ Upstream commit acc146943957d7418a6846f06e029b2c5e87e0d5 ] Make the divisor signed as DIV_ROUND_CLOSEST is undefined for negative dividends when the divisor is unsigned. Signed-off-by: Peter Rosin Cc: stable@vger.kernel.org Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- diff --git a/drivers/hwmon/ads1015.c b/drivers/hwmon/ads1015.c index f155b83..2b3105c 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); }