staging:iio: trigger fixes for repeat request of same trigger and allocation failure
Both of these are decidedly silly bugs show up whilst testing completely different code paths. Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
parent
4c3d15358a
commit
5dd72ecb01
|
@ -220,8 +220,16 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
|
||||||
ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
|
ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
|
||||||
pf->type, pf->name,
|
pf->type, pf->name,
|
||||||
pf);
|
pf);
|
||||||
if (trig->ops && trig->ops->set_trigger_state && notinuse)
|
if (ret < 0) {
|
||||||
|
module_put(pf->indio_dev->info->driver_module);
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (trig->ops && trig->ops->set_trigger_state && notinuse) {
|
||||||
ret = trig->ops->set_trigger_state(trig, true);
|
ret = trig->ops->set_trigger_state(trig, true);
|
||||||
|
if (ret < 0)
|
||||||
|
module_put(pf->indio_dev->info->driver_module);
|
||||||
|
}
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -334,6 +342,8 @@ static ssize_t iio_trigger_write_current(struct device *dev,
|
||||||
mutex_unlock(&indio_dev->mlock);
|
mutex_unlock(&indio_dev->mlock);
|
||||||
|
|
||||||
trig = iio_trigger_find_by_name(buf, len);
|
trig = iio_trigger_find_by_name(buf, len);
|
||||||
|
if (oldtrig == trig)
|
||||||
|
return len;
|
||||||
|
|
||||||
if (trig && indio_dev->info->validate_trigger) {
|
if (trig && indio_dev->info->validate_trigger) {
|
||||||
ret = indio_dev->info->validate_trigger(indio_dev, trig);
|
ret = indio_dev->info->validate_trigger(indio_dev, trig);
|
||||||
|
|
Loading…
Reference in New Issue