diff options
| author | Lorenzo Bianconi | 2017-03-14 22:05:20 +0100 |
|---|---|---|
| committer | Jonathan Cameron | 2017-03-19 11:44:42 +0100 |
| commit | 6985bd5e21901c2d2bfc924b114887e20c002901 (patch) | |
| tree | fbdbef597d9bd4c931b68a413fd18501af57816b /drivers/iio | |
| parent | iio: adc: ti_am335x_adc: fix fifo overrun recovery (diff) | |
| download | kernel-qcow2-linux-6985bd5e21901c2d2bfc924b114887e20c002901.tar.gz kernel-qcow2-linux-6985bd5e21901c2d2bfc924b114887e20c002901.tar.xz kernel-qcow2-linux-6985bd5e21901c2d2bfc924b114887e20c002901.zip | |
iio: imu: st_lsm6dsx: fix FIFO_CTRL2 overwrite during watermark configuration
Fixes: 290a6ce11d93 (iio: imu: add support to lsm6dsx driver)
Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@st.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio')
| -rw-r--r-- | drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c index 78532ce07449..81b572d7699a 100644 --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c @@ -193,8 +193,8 @@ int st_lsm6dsx_update_watermark(struct st_lsm6dsx_sensor *sensor, u16 watermark) if (err < 0) goto out; - fifo_watermark = ((data & ~ST_LSM6DSX_FIFO_TH_MASK) << 8) | - (fifo_watermark & ST_LSM6DSX_FIFO_TH_MASK); + fifo_watermark = ((data << 8) & ~ST_LSM6DSX_FIFO_TH_MASK) | + (fifo_watermark & ST_LSM6DSX_FIFO_TH_MASK); wdata = cpu_to_le16(fifo_watermark); err = hw->tf->write(hw->dev, ST_LSM6DSX_REG_FIFO_THL_ADDR, |