diff options
| author | Chris Zankel <chris@zankel.net> | 2015-08-29 23:55:58 (GMT) |
|---|---|---|
| committer | Chris Zankel <chris@zankel.net> | 2015-08-29 23:55:58 (GMT) |
| commit | 650c919798c71fb34b77a6f2ba03a06907f06a76 (patch) | |
| tree | d1c60012d4d86846d25f1d0b783b5122c26a2e31 /drivers/iio/light/cm3323.c | |
| parent | 895fb3159280fe7695b35ec7c87ec19e13ca5b6e (diff) | |
| parent | 64291f7db5bd8150a74ad2036f1037e6a0428df2 (diff) | |
| download | linux-650c919798c71fb34b77a6f2ba03a06907f06a76.tar.xz | |
Merge tag 'v4.2' into for_next
Linux 4.2
Diffstat (limited to 'drivers/iio/light/cm3323.c')
| -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 869033e..a1d4905 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, |