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

Marek Vasut · jic23 · commit e1b1fa66a039 · 2013-07-03T20:48:53.000+01:00
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 &lt;marex@denx.de&gt;
Cc: Fabio Estevam &lt;fabio.estevam@freescale.com&gt;
Cc: Jonathan Cameron &lt;jic23@kernel.org&gt;
Cc: Shawn Guo &lt;shawn.guo@linaro.org&gt;
Signed-off-by: Jonathan Cameron &lt;jic23@kernel.org&gt;
diff --git a/drivers/staging/iio/adc/mxs-lradc.c b/drivers/staging/iio/adc/mxs-lradc.c
@@ -661,12 +661,13 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)
 {
 	int ret;
 	struct iio_trigger *trig;
+	struct mxs_lradc *lradc = iio_priv(iio);
 
 	trig = iio_trigger_alloc("%s-dev%i", iio->name, iio->id);
 	if (trig == NULL)
 		return -ENOMEM;
 
-	trig->dev.parent = iio->dev.parent;
+	trig->dev.parent = lradc->dev;
 	iio_trigger_set_drvdata(trig, iio);
 	trig->ops = &mxs_lradc_trigger_ops;
 
@@ -676,15 +677,17 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)
 		return ret;
 	}
 
-	iio->trig = trig;
+	lradc->trig = trig;
 
 	return 0;
 }
 
 static void mxs_lradc_trigger_remove(struct iio_dev *iio)
 {
-	iio_trigger_unregister(iio->trig);
-	iio_trigger_free(iio->trig);
+	struct mxs_lradc *lradc = iio_priv(iio);
+
+	iio_trigger_unregister(lradc->trig);
+	iio_trigger_free(lradc->trig);
 }
 
 static int mxs_lradc_buffer_preenable(struct iio_dev *iio)

Original file line number	Diff line number	Diff line change
`@@ -661,12 +661,13 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)`
`661`	`661`	`{`
`662`	`662`	`int ret;`
`663`	`663`	`struct iio_trigger *trig;`
	`664`	`+ struct mxs_lradc *lradc = iio_priv(iio);`
`664`	`665`
`665`	`666`	`trig = iio_trigger_alloc("%s-dev%i", iio->name, iio->id);`
`666`	`667`	`if (trig == NULL)`
`667`	`668`	`return -ENOMEM;`
`668`	`669`
`669`		`- trig->dev.parent = iio->dev.parent;`
	`670`	`+ trig->dev.parent = lradc->dev;`
`670`	`671`	`iio_trigger_set_drvdata(trig, iio);`
`671`	`672`	`trig->ops = &mxs_lradc_trigger_ops;`
`672`	`673`
`@@ -676,15 +677,17 @@ static int mxs_lradc_trigger_init(struct iio_dev *iio)`
`676`	`677`	`return ret;`
`677`	`678`	`}`
`678`	`679`
`679`		`- iio->trig = trig;`
	`680`	`+ lradc->trig = trig;`
`680`	`681`
`681`	`682`	`return 0;`
`682`	`683`	`}`
`683`	`684`
`684`	`685`	`static void mxs_lradc_trigger_remove(struct iio_dev *iio)`
`685`	`686`	`{`
`686`		`- iio_trigger_unregister(iio->trig);`
`687`		`- iio_trigger_free(iio->trig);`
	`687`	`+ struct mxs_lradc *lradc = iio_priv(iio);`
	`688`	`+`
	`689`	`+ iio_trigger_unregister(lradc->trig);`
	`690`	`+ iio_trigger_free(lradc->trig);`
`688`	`691`	`}`
`689`	`692`
`690`	`693`	`static int mxs_lradc_buffer_preenable(struct iio_dev *iio)`