evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

iio: mxs-lradc: Fix misuse of iio->trig

Browse source 
The struct iio_dev .trig field is to be used only by the IIO core,
the driver shall not fill this field. This fixes ugly crash when
the driver is compiled as a module and the module is rmmod'd.

Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Fabio Estevam <fabio.estevam@freescale.com>
Cc: Jonathan Cameron <jic23@kernel.org>
Cc: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
This commit is contained in:
Marek Vasut 2013-06-29 22:20:00 +01:00 • committed by Jonathan Cameron
parent f91d1b63a4
commit e1b1fa66a0
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
drivers/staging/iio/adc/mxs-lradc.c
View file

@ -661,12 +661,13 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)
{ {
int ret; int ret;
struct iio_trigger *trig; struct iio_trigger *trig;
struct mxs_lradc *lradc = iio_priv(iio);
trig = iio_trigger_alloc("%s-dev%i", iio->name, iio->id); trig = iio_trigger_alloc("%s-dev%i", iio->name, iio->id);
if (trig == NULL) if (trig == NULL)
return -ENOMEM; return -ENOMEM;
trig->dev.parent = iio->dev.parent; trig->dev.parent = lradc->dev;
iio_trigger_set_drvdata(trig, iio); iio_trigger_set_drvdata(trig, iio);
trig->ops = &mxs_lradc_trigger_ops; trig->ops = &mxs_lradc_trigger_ops;
@ -676,15 +677,17 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)
return ret; return ret;
} }
iio->trig = trig; lradc->trig = trig;
return 0; return 0;
} }
static void mxs_lradc_trigger_remove(struct iio_dev *iio) static void mxs_lradc_trigger_remove(struct iio_dev *iio)
{ {
iio_trigger_unregister(iio->trig); struct mxs_lradc *lradc = iio_priv(iio);
iio_trigger_free(iio->trig);
iio_trigger_unregister(lradc->trig);
iio_trigger_free(lradc->trig);
} }
static int mxs_lradc_buffer_preenable(struct iio_dev *iio) static int mxs_lradc_buffer_preenable(struct iio_dev *iio)