aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTomasz Duszynski <tduszyns@gmail.com>2018-05-28 17:38:59 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2018-08-24 13:09:05 +0200
commitdc68381f4919fc312dd7a16871304264c0d2fa1c (patch)
tree62f4451ab51d8b69c247553cdaddecfefdd8d55b
parent9265a4509509eed4005fda908de5a154cc8c7e41 (diff)
downloadlinux-dc68381f4919fc312dd7a16871304264c0d2fa1c.tar.gz
iio: pressure: bmp280: fix relative humidity unit
[ Upstream commit 13399ff25f179811ce9c1df1523eb39f9e4a4772 ] According to IIO ABI relative humidity reading should be returned in milli percent. This patch addresses that by applying proper scaling and returning integer instead of fractional format type specifier. Note that the fixes tag is before the driver was heavily refactored to introduce spi support, so the patch won't apply that far back. Signed-off-by: Tomasz Duszynski <tduszyns@gmail.com> Fixes: 14beaa8f5ab1 ("iio: pressure: bmp280: add humidity support") Acked-by: Matt Ranostay <matt.ranostay@konsulko.com> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Sasha Levin <alexander.levin@microsoft.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/iio/pressure/bmp280-core.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/iio/pressure/bmp280-core.c b/drivers/iio/pressure/bmp280-core.c
index 8f26428804a23..5f625ffa2a88d 100644
--- a/drivers/iio/pressure/bmp280-core.c
+++ b/drivers/iio/pressure/bmp280-core.c
@@ -362,10 +362,9 @@ static int bmp280_read_humid(struct bmp280_data *data, int *val, int *val2)
}
comp_humidity = bmp280_compensate_humidity(data, adc_humidity);
- *val = comp_humidity;
- *val2 = 1024;
+ *val = comp_humidity * 1000 / 1024;
- return IIO_VAL_FRACTIONAL;
+ return IIO_VAL_INT;
}
static int bmp280_read_raw(struct iio_dev *indio_dev,