staging:iio: trigger fixes for repeat request of same trigger and allocation failure

commit 5dd72ecb0166498852705939163f375d693d37f3 upstream.

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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>

diff --git a/drivers/staging/iio/industrialio-trigger.c b/drivers/staging/iio/industrialio-trigger.c
index 2c626e0..57c8d83 100644 (file)
--- a/drivers/staging/iio/industrialio-trigger.c
+++ b/drivers/staging/iio/industrialio-trigger.c
@@ -222,8 +222,16 @@ static int iio_trigger_attach_poll_func(struct iio_trigger *trig,
        ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
                                   pf->type, pf->name,
                                   pf);
        ret = request_threaded_irq(pf->irq, pf->h, pf->thread,
                                   pf->type, pf->name,
                                   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;
 }


@@ -336,6 +344,8 @@ static ssize_t iio_trigger_write_current(struct device *dev,
        mutex_unlock(&indio_dev->mlock);
 
        trig = iio_trigger_find_by_name(buf, len);
        mutex_unlock(&indio_dev->mlock);
 
        trig = iio_trigger_find_by_name(buf, len);

+       if (oldtrig == trig)
+               return len;

 
        if (trig && indio_dev->info->validate_trigger) {
                ret = indio_dev->info->validate_trigger(indio_dev, trig);
 
        if (trig && indio_dev->info->validate_trigger) {
                ret = indio_dev->info->validate_trigger(indio_dev, trig);