aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorIvan T. Ivanov <ivan.ivanov@linaro.org>2015-04-17 10:51:08 -0400
committerJonathan Cameron <jic23@kernel.org>2015-04-18 12:40:04 -0400
commit937125aca00e0478c4024afe58bc620a7bbe2a93 (patch)
tree7ceaa11e4a3e80d4e773b9a4a4cdf3cafc5000a9 /drivers/iio
parentd0716b0ea4ce11a13477163c14b26e180922ba51 (diff)
iio: adc: spmi-vadc: Fix overflow in output value normalization
With 'dx' equal to 0.625V and 15 bit ADC, calculations overflow when difference against GND is ~20% of the ADC range. Fix this. Signed-off-by: Ivan T. Ivanov <ivan.ivanov@linaro.org> Cc: <stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/adc/qcom-spmi-vadc.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/iio/adc/qcom-spmi-vadc.c b/drivers/iio/adc/qcom-spmi-vadc.c
index 3211729bcb0b..0c4618b4d515 100644
--- a/drivers/iio/adc/qcom-spmi-vadc.c
+++ b/drivers/iio/adc/qcom-spmi-vadc.c
@@ -18,6 +18,7 @@
18#include <linux/iio/iio.h> 18#include <linux/iio/iio.h>
19#include <linux/interrupt.h> 19#include <linux/interrupt.h>
20#include <linux/kernel.h> 20#include <linux/kernel.h>
21#include <linux/math64.h>
21#include <linux/module.h> 22#include <linux/module.h>
22#include <linux/of.h> 23#include <linux/of.h>
23#include <linux/platform_device.h> 24#include <linux/platform_device.h>
@@ -471,11 +472,11 @@ static s32 vadc_calibrate(struct vadc_priv *vadc,
471 const struct vadc_channel_prop *prop, u16 adc_code) 472 const struct vadc_channel_prop *prop, u16 adc_code)
472{ 473{
473 const struct vadc_prescale_ratio *prescale; 474 const struct vadc_prescale_ratio *prescale;
474 s32 voltage; 475 s64 voltage;
475 476
476 voltage = adc_code - vadc->graph[prop->calibration].gnd; 477 voltage = adc_code - vadc->graph[prop->calibration].gnd;
477 voltage *= vadc->graph[prop->calibration].dx; 478 voltage *= vadc->graph[prop->calibration].dx;
478 voltage = voltage / vadc->graph[prop->calibration].dy; 479 voltage = div64_s64(voltage, vadc->graph[prop->calibration].dy);
479 480
480 if (prop->calibration == VADC_CALIB_ABSOLUTE) 481 if (prop->calibration == VADC_CALIB_ABSOLUTE)
481 voltage += vadc->graph[prop->calibration].dx; 482 voltage += vadc->graph[prop->calibration].dx;
@@ -487,7 +488,7 @@ static s32 vadc_calibrate(struct vadc_priv *vadc,
487 488
488 voltage = voltage * prescale->den; 489 voltage = voltage * prescale->den;
489 490
490 return voltage / prescale->num; 491 return div64_s64(voltage, prescale->num);
491} 492}
492 493
493static int vadc_decimation_from_dt(u32 value) 494static int vadc_decimation_from_dt(u32 value)