Merge tag 'omap-for-v4.8/legacy-signed' of git://git.kernel.org/pub/scm/linux/kernel...

[deliverable/linux.git] / drivers / media / media-devnode.c

diff --git a/drivers/media/media-devnode.c b/drivers/media/media-devnode.c
index 5b605ff38dafe4daa807addbe6ce540468e1ac57..f2772ba6f61163f59d25c31b9b1b4cf16d824856 100644 (file)
--- a/drivers/media/media-devnode.c
+++ b/drivers/media/media-devnode.c
@@ -287,7 +287,7 @@ cdev_add_error:
        return ret;
 }
 
-void media_devnode_unregister(struct media_devnode *devnode)
+void media_devnode_unregister_prepare(struct media_devnode *devnode)
 {
        /* Check if devnode was ever registered at all */
        if (!media_devnode_is_registered(devnode))
@@ -295,6 +295,12 @@ void media_devnode_unregister(struct media_devnode *devnode)
 
        mutex_lock(&media_devnode_lock);
        clear_bit(MEDIA_FLAG_REGISTERED, &devnode->flags);
+       mutex_unlock(&media_devnode_lock);
+}
+
+void media_devnode_unregister(struct media_devnode *devnode)
+{
+       mutex_lock(&media_devnode_lock);
        /* Delete the cdev on this minor as well */
        cdev_del(&devnode->cdev);
        mutex_unlock(&media_devnode_lock);