From: Hartmut Knaack <knaack.h@gmx.de>
Date: Wed, 17 Jun 2015 22:31:59 +0000 (+0200)
Subject: iio:light:cm3323: clear bitmask before set
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c288503b32e8c5534062a05ec565d28bffa06db3;p=GitHub%2Fmoto-9609%2Fandroid_kernel_motorola_exynos9610.git

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>
---

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,