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

iio: Fix error handling in iio_trigger_attach_poll_func

Browse source 
commit 99543823357966ac938d9a310947e731b67338e6 upstream.

When attaching a pollfunc iio_trigger_attach_poll_func will allocate a
virtual irq and call the driver's set_trigger_state function. Fix error
handling to undo previous steps if any fails.

In particular this fixes handling errors from a driver's
set_trigger_state function. When using triggered buffers a failure to
enable the trigger used to make the buffer unusable.

Signed-off-by: Crestez Dan Leonard <leonard.crestez@intel.com>
Signed-off-by: Jonathan Cameron <jic23@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Crestez Dan Leonard 2016-05-03 15:27:09 +03:00 • committed by Greg Kroah-Hartman
parent fe29254aed
commit dda5d00a2a
1 changed files with 18 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
drivers/iio/industrialio-trigger.c
View file

@ -210,22 +210,35 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
/* Prevent the module from being removed whilst attached to a trigger */ /* Prevent the module from being removed whilst attached to a trigger */
__module_get(pf->indio_dev->info->driver_module); __module_get(pf->indio_dev->info->driver_module);
/* Get irq number */
pf->irq = iio_trigger_get_irq(trig); pf->irq = iio_trigger_get_irq(trig);
if (pf->irq < 0)
goto out_put_module;
/* Request irq */
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 (ret < 0) { if (ret < 0)
module_put(pf->indio_dev->info->driver_module); goto out_put_irq;
return ret;
}
/* Enable trigger in driver */
if (trig->ops && trig->ops->set_trigger_state && notinuse) { 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) if (ret < 0)
module_put(pf->indio_dev->info->driver_module); goto out_free_irq;
} }
return ret; return ret;
out_free_irq:
free_irq(pf->irq, pf);
out_put_irq:
iio_trigger_put_irq(trig, pf->irq);
out_put_module:
module_put(pf->indio_dev->info->driver_module);
return ret;
} }
static int iio_trigger_detach_poll_func(struct iio_trigger *trig, static int iio_trigger_detach_poll_func(struct iio_trigger *trig,