Skip to content

Commit ed30292

Browse files
rockosovjic23
authored andcommitted
iio:accel:kxcjk-1013: rearrange iio trigger get and register
IIO trigger interface function iio_trigger_get() should be called after iio_trigger_register() (or its devm analogue) strictly, because of iio_trigger_get() acquires module refcnt based on the trigger->owner pointer, which is initialized inside iio_trigger_register() to THIS_MODULE. If this call order is wrong, the next iio_trigger_put() (from sysfs callback or "delete module" path) will dereference "default" module refcnt, which is incorrect behaviour. Fixes: c1288b8 ("iio: accel: kxcjk-1013: Increment ref counter for indio_dev->trig") Signed-off-by: Dmitry Rokosov <[email protected]> Reviewed-by: Andy Shevchenko <[email protected]> Link: https://lore.kernel.org/r/[email protected] Cc: <[email protected]> Signed-off-by: Jonathan Cameron <[email protected]>
1 parent e5f3205 commit ed30292

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

drivers/iio/accel/kxcjk-1013.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1554,12 +1554,12 @@ static int kxcjk1013_probe(struct i2c_client *client,
15541554

15551555
data->dready_trig->ops = &kxcjk1013_trigger_ops;
15561556
iio_trigger_set_drvdata(data->dready_trig, indio_dev);
1557-
indio_dev->trig = data->dready_trig;
1558-
iio_trigger_get(indio_dev->trig);
15591557
ret = iio_trigger_register(data->dready_trig);
15601558
if (ret)
15611559
goto err_poweroff;
15621560

1561+
indio_dev->trig = iio_trigger_get(data->dready_trig);
1562+
15631563
data->motion_trig->ops = &kxcjk1013_trigger_ops;
15641564
iio_trigger_set_drvdata(data->motion_trig, indio_dev);
15651565
ret = iio_trigger_register(data->motion_trig);

0 commit comments

Comments
 (0)