leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

staging:iio: Make sure all triggers have a trigger_ops for the owner field.

Browse Source 
The core needs the owner field to prevent module removal whilst in use and
uses it without confirming that the trigger_ops structure actually exists.

Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Acked-by: Lars-Peter Clausen <lars@metafoo.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Jonathan Cameron 2011-12-14 20:49:30 +00:00 committed by Greg Kroah-Hartman
parent 617156fb71
commit 8324e86077
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/staging/iio/adc/ad7192.c
View File

@ -609,6 +609,10 @@ static irqreturn_t ad7192_data_rdy_trig_poll(int irq, void *private)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static struct iio_trigger_ops ad7192_trigger_ops = {
.owner = THIS_MODULE,
};
static int ad7192_probe_trigger(struct iio_dev *indio_dev) static int ad7192_probe_trigger(struct iio_dev *indio_dev)
{ {
struct ad7192_state *st = iio_priv(indio_dev); struct ad7192_state *st = iio_priv(indio_dev);
@ -621,7 +625,7 @@ static int ad7192_probe_trigger(struct iio_dev *indio_dev)
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
st->trig->ops = &ad7192_trigger_ops;
ret = request_irq(st->spi->irq, ret = request_irq(st->spi->irq,
ad7192_data_rdy_trig_poll, ad7192_data_rdy_trig_poll,
IRQF_TRIGGER_LOW, IRQF_TRIGGER_LOW,

5
drivers/staging/iio/adc/ad7793.c
View File

@ -475,6 +475,10 @@ static irqreturn_t ad7793_data_rdy_trig_poll(int irq, void *private)
return IRQ_HANDLED; return IRQ_HANDLED;
} }
static struct iio_trigger_ops ad7793_trigger_ops = {
.owner = THIS_MODULE,
};
static int ad7793_probe_trigger(struct iio_dev *indio_dev) static int ad7793_probe_trigger(struct iio_dev *indio_dev)
{ {
struct ad7793_state *st = iio_priv(indio_dev); struct ad7793_state *st = iio_priv(indio_dev);
@ -487,6 +491,7 @@ static int ad7793_probe_trigger(struct iio_dev *indio_dev)
ret = -ENOMEM; ret = -ENOMEM;
goto error_ret; goto error_ret;
} }
st->trig->ops = &ad7793_trigger_ops;
ret = request_irq(st->spi->irq, ret = request_irq(st->spi->irq,
ad7793_data_rdy_trig_poll, ad7793_data_rdy_trig_poll,