Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9ebc9c53 authored by Peter Rosin's avatar Peter Rosin Committed by Sasha Levin
Browse files

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: default avatarPeter Rosin <peda@axentia.se>
Cc: stable@vger.kernel.org
Signed-off-by: default avatarGuenter Roeck <linux@roeck-us.net>
Signed-off-by: default avatarSasha Levin <sasha.levin@oracle.com>
parent 0b17b1b0

drivers/hwmon/ads1015.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}