Change au0828_unregister_media_device() to check media
device media device unregister is in progress and avoid
calling media_device_unregister() and other cleanup done
in au0828_unregister_media_device().

Signed-off-by: Shuah Khan <shua...@osg.samsung.com>
---
 drivers/media/usb/au0828/au0828-core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/drivers/media/usb/au0828/au0828-core.c 
b/drivers/media/usb/au0828/au0828-core.c
index 886fb28..de357a2 100644
--- a/drivers/media/usb/au0828/au0828-core.c
+++ b/drivers/media/usb/au0828/au0828-core.c
@@ -136,7 +136,9 @@ static void au0828_unregister_media_device(struct 
au0828_dev *dev)
 
 #ifdef CONFIG_MEDIA_CONTROLLER
        if (dev->media_dev &&
-               media_devnode_is_registered(&dev->media_dev->devnode)) {
+               media_devnode_is_registered(&dev->media_dev->devnode) &&
+               !media_device_is_unregister_in_progress(dev->media_dev)) {
+
                media_device_unregister(dev->media_dev);
                media_device_cleanup(dev->media_dev);
                dev->media_dev = NULL;
-- 
2.5.0

--
To unsubscribe from this list: send the line "unsubscribe linux-media" in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to