[PATCH 31/31] media: au0828 change to check media device unregister progress state
From: Shuah Khan <hidden>
Date: 2016-01-06 20:57:36
Also in:
alsa-devel, linux-media, lkml
Subsystem:
media input infrastructure (v4l/dvb), the rest · Maintainers:
Mauro Carvalho Chehab, Linus Torvalds
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 <redacted> --- 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