diff options
| author | Crestez Dan Leonard <leonard.crestez@intel.com> | 2016-05-13 21:43:33 +0300 |
|---|---|---|
| committer | Jonathan Cameron <jic23@kernel.org> | 2016-05-29 20:25:27 +0100 |
| commit | ff05916f94f912b25e8efcf9b02c10d481977bab (patch) | |
| tree | 4f418509a534fc6c19c7057cadbbdc57461a6520 /drivers/iio/common | |
| parent | 65925b65ed98ffdb277cf5ea1af45731dac0b30b (diff) | |
| download | op-kernel-dev-ff05916f94f912b25e8efcf9b02c10d481977bab.zip op-kernel-dev-ff05916f94f912b25e8efcf9b02c10d481977bab.tar.gz | |
iio: st_sensors: Init trigger before irq request
This fixes a possible race where an interrupt arrives before complete
initialization and crashes because iio_trigger_get_drvdata returns NULL.
Cc: Giuseppe Barba <giuseppe.barba@st.com>
Cc: Denis Ciocca <denis.ciocca@st.com>
Signed-off-by: Crestez Dan Leonard <leonard.crestez@intel.com>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Diffstat (limited to 'drivers/iio/common')
| -rw-r--r-- | drivers/iio/common/st_sensors/st_sensors_trigger.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/iio/common/st_sensors/st_sensors_trigger.c b/drivers/iio/common/st_sensors/st_sensors_trigger.c index 1f59bcc..296e4ff 100644 --- a/drivers/iio/common/st_sensors/st_sensors_trigger.c +++ b/drivers/iio/common/st_sensors/st_sensors_trigger.c @@ -97,6 +97,10 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, return -ENOMEM; } + iio_trigger_set_drvdata(sdata->trig, indio_dev); + sdata->trig->ops = trigger_ops; + sdata->trig->dev.parent = sdata->dev; + irq = sdata->get_irq_data_ready(indio_dev); irq_trig = irqd_get_trigger_type(irq_get_irq_data(irq)); /* @@ -158,10 +162,6 @@ int st_sensors_allocate_trigger(struct iio_dev *indio_dev, goto iio_trigger_free; } - iio_trigger_set_drvdata(sdata->trig, indio_dev); - sdata->trig->ops = trigger_ops; - sdata->trig->dev.parent = sdata->dev; - err = iio_trigger_register(sdata->trig); if (err < 0) { dev_err(&indio_dev->dev, "failed to register iio trigger.\n"); |
