Commit 85643586 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging

Pull hwmon fix from Guenter Roeck:
 "Fix arithmetic overflow in ntc_thermistor driver"

* tag 'hwmon-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging:
  hwmon: (ntc_thermistor) Avoid math overflow
parents 0a33d88d d3d89c46
...@@ -145,7 +145,7 @@ struct ntc_data { ...@@ -145,7 +145,7 @@ struct ntc_data {
static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata) static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
{ {
struct iio_channel *channel = pdata->chan; struct iio_channel *channel = pdata->chan;
unsigned int result; s64 result;
int val, ret; int val, ret;
ret = iio_read_channel_raw(channel, &val); ret = iio_read_channel_raw(channel, &val);
...@@ -155,10 +155,10 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata) ...@@ -155,10 +155,10 @@ static int ntc_adc_iio_read(struct ntc_thermistor_platform_data *pdata)
} }
/* unit: mV */ /* unit: mV */
result = pdata->pullup_uv * val; result = pdata->pullup_uv * (s64) val;
result >>= 12; result >>= 12;
return result; return (int)result;
} }
static const struct of_device_id ntc_match[] = { static const struct of_device_id ntc_match[] = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment