diff options
author | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:48 +0800 |
---|---|---|
committer | Alex Shi <alex.shi@linaro.org> | 2016-03-18 12:01:48 +0800 |
commit | 421a8ddd1fc901897eee73965b442af4b4dd7095 (patch) | |
tree | e9bd7aef46f35c1857700b9c52ad24f6a68f957c /drivers/hwmon/ads1015.c | |
parent | 82211c838b558293e48c8fcd816f6609ebc7e4b3 (diff) | |
parent | d439e869d612dd7a338ac75a4afc3646a5e67370 (diff) |
Merge tag 'v3.18.29' into linux-linaro-lsk-v3.18lsk-v3.18-16.03
This is the 3.18.29 stable release
Diffstat (limited to 'drivers/hwmon/ads1015.c')
-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); } |