summaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorAlison Schofield <amsfield22@gmail.com>2016-05-20 10:06:41 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-07-27 08:42:21 -0700
commit65a39273cf07603ffe8734557c83ac3ce8917253 (patch)
tree1856c8611783ee22b345310f88265c9a8f37c0e6 /drivers/iio
parent4866f01a114489b78f7a2443ec363a2330bf8ab1 (diff)
downloadlinux-stable-65a39273cf07603ffe8734557c83ac3ce8917253.tar.gz
linux-stable-65a39273cf07603ffe8734557c83ac3ce8917253.tar.bz2
linux-stable-65a39273cf07603ffe8734557c83ac3ce8917253.zip
iio: humidity: hdc100x: correct humidity integration time mask
commit 0e35cf5ce00d873d6e529d2b2cd7598d52438051 upstream. Apply the correct mask to enable all available humidity integration times. Currently, the driver defaults to 6500 and all is okay with that. However, if 3850 is selected we get a stuck bit and can't change back to 6500 or select 2500. (Verified with HDC1008) Signed-off-by: Alison Schofield <amsfield22@gmail.com> Cc: Daniel Baluta <daniel.baluta@gmail.com> Reviewed-by: Matt Ranostay <mranostay@gmail.com> Signed-off-by: Jonathan Cameron <jic23@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/humidity/hdc100x.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/humidity/hdc100x.c b/drivers/iio/humidity/hdc100x.c
index fa4767613173..59aa1cbdc2fd 100644
--- a/drivers/iio/humidity/hdc100x.c
+++ b/drivers/iio/humidity/hdc100x.c
@@ -55,7 +55,7 @@ static const struct {
},
{ /* IIO_HUMIDITYRELATIVE channel */
.shift = 8,
- .mask = 2,
+ .mask = 3,
},
};