Merge branch 'for-3.11/drivers' of git://git.kernel.dk/linux-block

[sagit-ice-cold/kernel_xiaomi_msm8998.git] / drivers / iio / industrialio-trigger.c

diff --git a/drivers/iio/industrialio-trigger.c b/drivers/iio/industrialio-trigger.c
index 4d6c7d8..ea8a414 100644 (file)
--- a/drivers/iio/industrialio-trigger.c
+++ b/drivers/iio/industrialio-trigger.c
@@ -104,7 +104,7 @@ void iio_trigger_unregister(struct iio_trigger *trig_info)
 
        ida_simple_remove(&iio_trigger_ida, trig_info->id);
        /* Possible issue in here */
-       device_unregister(&trig_info->dev);
+       device_del(&trig_info->dev);
 }
 EXPORT_SYMBOL(iio_trigger_unregister);