On 14/03/17 21:05, Lorenzo Bianconi wrote: > Fixes: 290a6ce11d93 (iio: imu: add support to lsm6dsx driver) > Signed-off-by: Lorenzo Bianconi <lorenzo.bianconi@xxxxxx> Applied to the fixes-togreg branch of iio.git. Thanks, Jonathan > --- > drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 4 ++-- > 1 file 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 e71ecce..e959825 100644 > --- a/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > +++ b/drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c > @@ -194,8 +194,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, > -- To unsubscribe from this list: send the line "unsubscribe linux-iio" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
