diff options
| author | Peter Rosin <peda@axentia.se> | 2016-02-18 14:07:52 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-07 21:30:06 -0500 |
| commit | 9ebc9c5351f659b6be3e2e1fed3e058ec9cb8e3d (patch) | |
| tree | dac9f4995a875ba936766d0c151ec231a1e9a650 | |
| parent | 0b17b1b036503671b2960883c629a67d60e8c488 (diff) | |
| download | lwn-9ebc9c5351f659b6be3e2e1fed3e058ec9cb8e3d.tar.gz lwn-9ebc9c5351f659b6be3e2e1fed3e058ec9cb8e3d.zip | |
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 <peda@axentia.se>
Cc: stable@vger.kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -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); } |