diff options
| author | Jonathan Cameron <jic23@cam.ac.uk> | 2009-12-16 21:38:28 +0100 |
|---|---|---|
| committer | Jean Delvare <khali@linux-fr.org> | 2009-12-16 21:38:28 +0100 |
| commit | 4235f684b66d6f00d2cd8849c884cf8f8b57ecad (patch) | |
| tree | 180599fdf75c31b7ab7e41d2b5b696f175121c05 /drivers/hwmon | |
| parent | 70c38772aef27b01dc236fb4016261c3828df6aa (diff) | |
| download | blackbird-obmc-linux-4235f684b66d6f00d2cd8849c884cf8f8b57ecad.tar.gz blackbird-obmc-linux-4235f684b66d6f00d2cd8849c884cf8f8b57ecad.zip | |
hwmon: (sht15) Off-by-one error in array index + incorrect constants
Fix an off-by-one error in array index + incorrect constants.
Signed-off-by: Christoph Walser <walser@tik.ee.ethz.ch>
Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
Diffstat (limited to 'drivers/hwmon')
| -rw-r--r-- | drivers/hwmon/sht15.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/hwmon/sht15.c b/drivers/hwmon/sht15.c index ebe38b680ee3..864a371f6eb9 100644 --- a/drivers/hwmon/sht15.c +++ b/drivers/hwmon/sht15.c @@ -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; } |
