hwmon: sht15: Off by one error in array index
PATCH 1/1 hwmon: sht15: Off by one error in array index
---
Christoph noticed some problems with the sht15 driver and was kind enough to send me a patch. If no one has any issues with this, it should also go in stable once it merges with mainline.
drivers/hwmon/sht15.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/sht15.c +3 -3
@@ -305,7 +305,7 @@ static inline int sht15_calc_temp(struct sht15_data *data)int d1 =0 ;int i; -for (i =1 ; i <ARRAY_SIZE (temppoints) -1 ; i++) +for (i =1 ; i <ARRAY_SIZE (temppoints); i++)/* Find pointer to interpolate */ if (data->supply_uV > temppoints[i -1 ].vdd) { d1 = (data->supply_uV/1000 - temppoints[i -1 ].vdd)
@@ -332,12 +332,12 @@ static inline int sht15_calc_humid(struct sht15_data *data)const int c1 =-4 ;const int c2 =40500 ;/* x 10 ^ -6 */ -const int c3 =2800 ;/* x10 ^ -9 */ +const int c3 =-2800 ;/* x10 ^ -9 */ RHlinear = c1*1000 + c2 * data->val_humid/1000 + (data->val_humid * data->val_humid * c3)/1000000 ; -return (temp -25000 ) * (10000 +800 * data->val_humid) +return (temp -25000 ) * (10000 +80 * data->val_humid) /1000000 + RHlinear; }
Signature · 7 lines
1.6.4.4 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
PATCH 1/1 hwmon: sht15: Off by one error in array index
---
Christoph noticed some problems with the sht15 driver and was kind enough to send me a patch. If no one has any issues with this, it should also go in stable once it merges with mainline.
Sorry all. Typo in Christoph's email adress in previous version.
drivers/hwmon/sht15.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)
drivers/hwmon/sht15.c +3 -3
@@ -305,7 +305,7 @@ static inline int sht15_calc_temp(struct sht15_data *data)int d1 =0 ;int i; -for (i =1 ; i <ARRAY_SIZE (temppoints) -1 ; i++) +for (i =1 ; i <ARRAY_SIZE (temppoints); i++)/* Find pointer to interpolate */ if (data->supply_uV > temppoints[i -1 ].vdd) { d1 = (data->supply_uV/1000 - temppoints[i -1 ].vdd)
@@ -332,12 +332,12 @@ static inline int sht15_calc_humid(struct sht15_data *data)const int c1 =-4 ;const int c2 =40500 ;/* x 10 ^ -6 */ -const int c3 =2800 ;/* x10 ^ -9 */ +const int c3 =-2800 ;/* x10 ^ -9 */ RHlinear = c1*1000 + c2 * data->val_humid/1000 + (data->val_humid * data->val_humid * c3)/1000000 ; -return (temp -25000 ) * (10000 +800 * data->val_humid) +return (temp -25000 ) * (10000 +80 * data->val_humid) /1000000 + RHlinear; }
Signature · 8 lines
1.6.4.4 _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors
Jean Delvare
AppliedRe: [lm-sensors] [PATCH] hwmon: sht15: Off by one error in array
In reply to Jonathan CameronQuoted 32 lines · Jonathan Cameron
Signed-off-by Christoph Walser <[email protected]>Signed-off-by Jonathan Cameron <[email protected]>---
Christoph noticed some problems with the sht15 driver and was kind enough to send me a patch. If no one has any issues with this, it should also go in stable once it merges with mainline.
Sorry all. Typo in Christoph's email adress in previous version.
drivers/hwmon/sht15.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-)drivers/hwmon/sht15.c +1
-2@@ -305,7 +305,7 @@ static inline int sht15_calc_temp(struct sht15_data *data)int d1 =0 ;int i; -for (i =1 ; i <ARRAY_SIZE (temppoints) -1 ; i++) +for (i =1 ; i <ARRAY_SIZE (temppoints); i++)/* Find pointer to interpolate */ if (data->supply_uV > temppoints[i -1 ].vdd) { d1 = (data->supply_uV/1000 - temppoints[i -1 ].vdd)@@ -332,12 +332,12 @@ static inline int sht15_calc_humid(struct sht15_data *data)const int c1 =-4 ;const int c2 =40500 ;/* x 10 ^ -6 */ -const int c3 =2800 ;/* x10 ^ -9 */
drivers/hwmon/sht15.c static inline int sht15_calc_humid(struct sht15_data *data) · line 343
Quoted 10 lines
drivers/hwmon/sht15.c +2
-1+const int c3 =-2800 ;/* x10 ^ -9 */ RHlinear = c1*1000 + c2 * data->val_humid/1000 + (data->val_humid * data->val_humid * c3)/1000000 ; -return (temp -25000 ) * (10000 +800 * data->val_humid) +return (temp -25000 ) * (10000 +80 * data->val_humid) /1000000 + RHlinear; }
Applied, thanks.
Signature · 6 lines
Jean Delvare _______________________________________________ lm-sensors mailing list [email protected] http://lists.lm-sensors.org/mailman/listinfo/lm-sensors