Patch "iio:light:cm3323: clear bitmask before set" has been added to the 4.1-stable tree

Patch "iio:light:cm3323: clear bitmask before set" has been added to the 4.1-stable tree

[gregkh]

This is a note to let you know that I've just added the patch titled

    iio:light:cm3323: clear bitmask before set

to the 4.1-stable tree which can be found at:
    http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     iio-light-cm3323-clear-bitmask-before-set.patch
and it can be found in the queue-4.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@vger.kernel.org> know about it.


>From c288503b32e8c5534062a05ec565d28bffa06db3 Mon Sep 17 00:00:00 2001
From: Hartmut Knaack <knaack.h@gmx.de>
Date: Thu, 18 Jun 2015 00:31:59 +0200
Subject: iio:light:cm3323: clear bitmask before set

From: Hartmut Knaack <knaack.h@gmx.de>

commit c288503b32e8c5534062a05ec565d28bffa06db3 upstream.

When setting the bits for integration time, the appropriate bitmask needs
to be cleared first.

Signed-off-by: Hartmut Knaack <knaack.h@gmx.de>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

---
 drivers/iio/light/cm3323.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/iio/light/cm3323.c
+++ b/drivers/iio/light/cm3323.c
@@ -123,7 +123,7 @@ static int cm3323_set_it_bits(struct cm3
 	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,


Patches currently in stable-queue which might be from knaack.h@gmx.de are

queue-4.1/iio-accel-bmc150-accel-fix-counting-direction.patch
queue-4.1/iio-light-cm3323-clear-bitmask-before-set.patch
queue-4.1/iio-adc-cc10001_adc-fix-kconfig-dependency.patch