]> git.karo-electronics.de Git - linux-beck.git/commitdiff
staging:iio:triggers. Add a reference get to the core for triggers.
authorJonathan Cameron <jic23@cam.ac.uk>
Wed, 24 Aug 2011 16:28:33 +0000 (17:28 +0100)
committerGreg Kroah-Hartman <gregkh@suse.de>
Wed, 24 Aug 2011 21:23:41 +0000 (14:23 -0700)
This is to do with dynamically allocated triggers and the need to ensure
the underlying structures don't go away when a consumer is using them.

Signed-off-by: Jonathan Cameron <jic23@cam.ac.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/iio/industrialio-trigger.c

index ebacfdadee1b48d61a58b5e94a21f4d52ffb2c91..89a993430d18b279a82b7f6059701613d67b7a99 100644 (file)
@@ -8,7 +8,6 @@
  */
 
 #include <linux/kernel.h>
-#include <linux/module.h>
 #include <linux/idr.h>
 #include <linux/err.h>
 #include <linux/device.h>
@@ -478,6 +477,7 @@ struct iio_trigger *iio_allocate_trigger(const char *fmt, ...)
                                          IRQ_NOPROBE);
                }
                iio_get();
+               get_device(&trig->dev);
        }
        return trig;
 }
@@ -501,6 +501,9 @@ EXPORT_SYMBOL(iio_device_register_trigger_consumer);
 
 int iio_device_unregister_trigger_consumer(struct iio_dev *dev_info)
 {
+       /* Clean up and associated but not attached triggers references */
+       if (dev_info->trig)
+               iio_put_trigger(dev_info->trig);
        sysfs_remove_group(&dev_info->dev.kobj,
                           &iio_trigger_consumer_attr_group);
        return 0;