Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

hwmon: (sht15) Fix sht15_calc_temp interpolation function

I discovered two issues.
First the previous sht15_calc_temp() loop did not iterate through the
temppoints array since the (data->supply_uV > temppoints[i - 1].vdd)
test is always true in this direction.

Also the two-points linear interpolation function was returning biased
values due to a stray division by 1000 which shouldn't be there.

[JD: Also change the default value for d1 from 0 to something saner.]

Signed-off-by: Jerome Oufella <jerome.oufella@savoirfairelinux.com>
Acked-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Cc: stable@kernel.org

authored by

Jerome Oufella and committed by
Jean Delvare
328a2c22 2ba3abd8

+3 -3
+3 -3
drivers/hwmon/sht15.c
··· 303 303 **/ 304 304 static inline int sht15_calc_temp(struct sht15_data *data) 305 305 { 306 - int d1 = 0; 306 + int d1 = temppoints[0].d1; 307 307 int i; 308 308 309 - for (i = 1; i < ARRAY_SIZE(temppoints); i++) 309 + for (i = ARRAY_SIZE(temppoints) - 1; i > 0; i--) 310 310 /* Find pointer to interpolate */ 311 311 if (data->supply_uV > temppoints[i - 1].vdd) { 312 - d1 = (data->supply_uV/1000 - temppoints[i - 1].vdd) 312 + d1 = (data->supply_uV - temppoints[i - 1].vdd) 313 313 * (temppoints[i].d1 - temppoints[i - 1].d1) 314 314 / (temppoints[i].vdd - temppoints[i - 1].vdd) 315 315 + temppoints[i - 1].d1;