android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iio: imu: st_lsm6dsx: always check enable_reg in st_lsm6dsx_event_setup

Browse Source 
Check if enable_reg of event_settings data structure is defined before
writing on it

Fixes: b5969abfa8 ("iio: imu: st_lsm6dsx: add motion events")
Signed-off-by: Lorenzo Bianconi <lorenzo@kernel.org>
Tested-by: Sean Nyekjaer <sean@geanix.com>
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
This commit is contained in:
Lorenzo Bianconi 2019-10-06 15:22:00 +02:00 committed by Jonathan Cameron
parent 66b662a176
commit 84b2e7c319
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c
View File

@ -1497,26 +1497,25 @@ static int st_lsm6dsx_write_raw(struct iio_dev *iio_dev,
static int st_lsm6dsx_event_setup(struct st_lsm6dsx_hw *hw, int state)
{
const struct st_lsm6dsx_reg *reg;
int err;
u8 enable = 0;
if (!hw->settings->irq_config.irq1_func.addr)
return -ENOTSUPP;
enable = state ? hw->settings->event_settings.enable_reg.mask : 0;
err = regmap_update_bits(hw->regmap,
hw->settings->event_settings.enable_reg.addr,
hw->settings->event_settings.enable_reg.mask,
enable);
if (err < 0)
return err;
enable = state ? hw->irq_routing->mask : 0;
reg = &hw->settings->event_settings.enable_reg;
if (reg->addr) {
err = regmap_update_bits(hw->regmap, reg->addr, reg->mask,
ST_LSM6DSX_SHIFT_VAL(state, reg->mask));
if (err < 0)
return err;
}
/* Enable wakeup interrupt */
return regmap_update_bits(hw->regmap, hw->irq_routing->addr,
hw->irq_routing->mask, enable);
hw->irq_routing->mask,
ST_LSM6DSX_SHIFT_VAL(state,
hw->irq_routing->mask));
}
static int st_lsm6dsx_read_event(struct iio_dev *iio_dev,