diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-11-15 04:07:54 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-11-15 04:07:54 -0800 |
| commit | 2db8e297793b9018dd70407ac8addb8190e6ff16 (patch) | |
| tree | 8605249659ddd399fdf81cb3b975610dca2b1763 /drivers/iio | |
| parent | adb38b45190379f7e966e0f2adc810bf789e6fda (diff) | |
| parent | bb2c232a14d3400da60625342fc730485ef94376 (diff) | |
Merge "iio: adc: qcom-tadc: cast raw ADC readings before conversion"
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/adc/qcom-tadc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/adc/qcom-tadc.c b/drivers/iio/adc/qcom-tadc.c index 3cc2694f9a03..4a56847a43e7 100644 --- a/drivers/iio/adc/qcom-tadc.c +++ b/drivers/iio/adc/qcom-tadc.c @@ -398,7 +398,7 @@ static int tadc_do_conversion(struct tadc_chip *chip, u8 channels, s16 *adc) } for (i = 0; i < TADC_NUM_CH; i++) - adc[i] = val[i * 2] | val[i * 2 + 1] << BITS_PER_BYTE; + adc[i] = (s16)(val[i * 2] | (u16)val[i * 2 + 1] << 8); return jiffies_to_msecs(timeout - timeleft); } |