mirror of
https://github.com/torvalds/linux.git
synced 2026-06-06 21:45:45 +02:00
iio:accel:mxc4005: rearrange iio trigger get and register
commit9354c224c9upstream. 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:47196620c8("iio: mxc4005: add data ready trigger for mxc4005") Signed-off-by: Dmitry Rokosov <ddrokosov@sberdevices.ru> Reviewed-by: Andy Shevchenko <andy.shevchenko@gmail.com> Link: https://lore.kernel.org/r/20220524181150.9240-4-ddrokosov@sberdevices.ru Cc: <Stable@vger.kernel.org> Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
e26dcf6279
commit
42caf44906
|
|
@ -461,8 +461,6 @@ static int mxc4005_probe(struct i2c_client *client,
|
||||||
data->dready_trig->dev.parent = &client->dev;
|
data->dready_trig->dev.parent = &client->dev;
|
||||||
data->dready_trig->ops = &mxc4005_trigger_ops;
|
data->dready_trig->ops = &mxc4005_trigger_ops;
|
||||||
iio_trigger_set_drvdata(data->dready_trig, indio_dev);
|
iio_trigger_set_drvdata(data->dready_trig, indio_dev);
|
||||||
indio_dev->trig = data->dready_trig;
|
|
||||||
iio_trigger_get(indio_dev->trig);
|
|
||||||
ret = devm_iio_trigger_register(&client->dev,
|
ret = devm_iio_trigger_register(&client->dev,
|
||||||
data->dready_trig);
|
data->dready_trig);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
|
|
@ -470,6 +468,8 @@ static int mxc4005_probe(struct i2c_client *client,
|
||||||
"failed to register trigger\n");
|
"failed to register trigger\n");
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
indio_dev->trig = iio_trigger_get(data->dready_trig);
|
||||||
}
|
}
|
||||||
|
|
||||||
return devm_iio_device_register(&client->dev, indio_dev);
|
return devm_iio_device_register(&client->dev, indio_dev);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user