aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/iio
diff options
context:
space:
mode:
authorPeter Meerwald <pmeerw@pmeerw.net>2015-06-14 23:09:35 +0200
committerJonathan Cameron <jic23@kernel.org>2015-07-19 11:48:10 +0100
commit40f34b0c75c2a633ba647afec41947d8dd3bc920 (patch)
treeeb40fd784efe520afbba331bd6e65eec3d673544 /drivers/iio
parentiio:accel:bmc150-accel: fix counting direction (diff)
downloadlinux-dev-40f34b0c75c2a633ba647afec41947d8dd3bc920.tar.xz
linux-dev-40f34b0c75c2a633ba647afec41947d8dd3bc920.zip
iio: light: tcs3414: Fix bug preventing to set integration time
the millisecond values in tcs3414_times should be checked against val2, not val, which is always zero. Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net> Reported-by: Stephan Kleisinger <stephan.kleisinger@gmail.com> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
-rw-r--r--drivers/iio/light/tcs3414.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/light/tcs3414.c b/drivers/iio/light/tcs3414.c
index 71c2bde275aa..f8b1df018abe 100644
--- a/drivers/iio/light/tcs3414.c
+++ b/drivers/iio/light/tcs3414.c
@@ -185,7 +185,7 @@ static int tcs3414_write_raw(struct iio_dev *indio_dev,
if (val != 0)
return -EINVAL;
for (i = 0; i < ARRAY_SIZE(tcs3414_times); i++) {
- if (val == tcs3414_times[i] * 1000) {
+ if (val2 == tcs3414_times[i] * 1000) {
data->timing &= ~TCS3414_INTEG_MASK;
data->timing |= i;
return i2c_smbus_write_byte_data(