]> git.proxmox.com Git - mirror_ubuntu-zesty-kernel.git/commitdiff
[media] media: au0828 fix to clear enable/disable/change source handlers
authorShuah Khan <shuahkh@osg.samsung.com>
Sun, 13 Mar 2016 03:57:40 +0000 (00:57 -0300)
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>
Thu, 31 Mar 2016 17:50:39 +0000 (14:50 -0300)
Fix to clear enable/disable/change source handlers in the media device
when media device is unregistered in au0828_unregister_media_device().
When au0828 module is removed, snd-usb-audio shouldn't call the handlers.
Clearing will ensure snd-usb-audio won't call them once au0828 is removed.

[mchehab@osg.samsung.com: fix a compilation breakage]
Signed-off-by: Shuah Khan <shuahkh@osg.samsung.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
drivers/media/usb/au0828/au0828-core.c

index ecfa189396639a469d538e533ac36ddbeca8f8a1..2fcd17d9b1a687432645345a6d26fb0081f2cfb1 100644 (file)
@@ -137,6 +137,11 @@ 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)) {
+               /* clear enable_source, disable_source */
+               dev->media_dev->source_priv = NULL;
+               dev->media_dev->enable_source = NULL;
+               dev->media_dev->disable_source = NULL;
+
                media_device_unregister(dev->media_dev);
                media_device_cleanup(dev->media_dev);
                dev->media_dev = NULL;