diff options
| author | Hartmut Knaack | 2015-06-18 00:31:59 +0200 |
|---|---|---|
| committer | Jonathan Cameron | 2015-07-19 12:48:08 +0200 |
| commit | bd7bd0cc3a60e082b17a4f64ce76831aa1c6dffe (patch) | |
| tree | 722f46cfddb39852c57edc9d2e10f2c68cedb83d /drivers/iio | |
| parent | iio: adc: at91_adc: allow to use full range of startup time (diff) | |
| download | kernel-qcow2-linux-bd7bd0cc3a60e082b17a4f64ce76831aa1c6dffe.tar.gz kernel-qcow2-linux-bd7bd0cc3a60e082b17a4f64ce76831aa1c6dffe.tar.xz kernel-qcow2-linux-bd7bd0cc3a60e082b17a4f64ce76831aa1c6dffe.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/iio')
| -rw-r--r-- | drivers/iio/light/cm3323.c | 2 |
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, |