summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHartmut Knaack <knaack.h@gmx.de>2015-06-18 00:31:59 +0200
committerJonathan Cameron <jic23@kernel.org>2015-06-21 15:24:58 +0200
commitc288503b32e8c5534062a05ec565d28bffa06db3 (patch)
treee269028250c7cb8189e455cb62a3f9e1fbf359d6 /drivers
parentiio: adc: at91_adc: allow to use full range of startup time (diff)
downloadlinux-c288503b32e8c5534062a05ec565d28bffa06db3.tar.xz
linux-c288503b32e8c5534062a05ec565d28bffa06db3.zip
iio:light:cm3323: clear bitmask before set
When setting the bits for integration time, the appropriate bitmask needs to be cleared first. Signed-off-by: Hartmut Knaack <knaack.h@gmx.de> Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/iio/light/cm3323.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/light/cm3323.c b/drivers/iio/light/cm3323.c
index 869033e48a1f..a1d4905cc9d2 100644
--- a/drivers/iio/light/cm3323.c
+++ b/drivers/iio/light/cm3323.c
@@ -123,7 +123,7 @@ static int cm3323_set_it_bits(struct cm3323_data *data, int val, int val2)
for (i = 0; i < ARRAY_SIZE(cm3323_int_time); i++) {
if (val == cm3323_int_time[i].val &&
val2 == cm3323_int_time[i].val2) {
- reg_conf = data->reg_conf;
+ reg_conf = data->reg_conf & ~CM3323_CONF_IT_MASK;
reg_conf |= i << CM3323_CONF_IT_SHIFT;
ret = i2c_smbus_write_word_data(data->client,