diff options
| author | Greg Kroah-Hartman | 2013-10-07 02:22:43 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman | 2013-10-07 02:22:43 +0200 |
| commit | 02ab343f3b497421793cb4c9725587f9052f7078 (patch) | |
| tree | 282180d93a177bb61d22190f72c54bc029302b24 /drivers/iio/industrialio-core.c | |
| parent | Merge tag 'iio-for-3.13c' of git://git.kernel.org/pub/scm/linux/kernel/git/ji... (diff) | |
| parent | Linux 3.12-rc4 (diff) | |
| download | kernel-qcow2-linux-02ab343f3b497421793cb4c9725587f9052f7078.tar.gz kernel-qcow2-linux-02ab343f3b497421793cb4c9725587f9052f7078.tar.xz kernel-qcow2-linux-02ab343f3b497421793cb4c9725587f9052f7078.zip | |
Merge 3.12-rc4 into staging-next
We want the staging fixes in this branch as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/iio/industrialio-core.c')
| -rw-r--r-- | drivers/iio/industrialio-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 863aa010ce5a..ecf58963ac24 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -894,7 +894,6 @@ static void iio_dev_release(struct device *device) iio_device_unregister_trigger_consumer(indio_dev); iio_device_unregister_eventset(indio_dev); iio_device_unregister_sysfs(indio_dev); - iio_device_unregister_debugfs(indio_dev); ida_simple_remove(&iio_ida, indio_dev->id); kfree(indio_dev); @@ -1129,6 +1128,7 @@ void iio_device_unregister(struct iio_dev *indio_dev) if (indio_dev->chrdev.dev) cdev_del(&indio_dev->chrdev); + iio_device_unregister_debugfs(indio_dev); iio_disable_all_buffers(indio_dev); |