diff mbox series

vivid: two unregistration fixes

Message ID f017af06-4810-9307-4de3-e32b3185bfa6@xs4all.nl (mailing list archive)
State New, archived
Headers show
Series vivid: two unregistration fixes | expand

Commit Message

Hans Verkuil Feb. 17, 2019, 2:12 p.m. UTC 
When the media device registration fails, don't call media_device_unregister
since the device was never actually registered.

When removing the module also call media_device_cleanup() to avoid a memory leak.

Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
---
diff mbox series

Patch

diff --git a/drivers/media/platform/vivid/vivid-core.c b/drivers/media/platform/vivid/vivid-core.c
index 29e7b14fa704..342e0e6c103b 100644
--- a/drivers/media/platform/vivid/vivid-core.c
+++ b/drivers/media/platform/vivid/vivid-core.c
@@ -1478,9 +1478,6 @@  static int vivid_create_instance(struct platform_device *pdev, int inst)
 	return 0;

 unreg_dev:
-#ifdef CONFIG_MEDIA_CONTROLLER
-	media_device_unregister(&dev->mdev);
-#endif
 	video_unregister_device(&dev->radio_tx_dev);
 	video_unregister_device(&dev->radio_rx_dev);
 	video_unregister_device(&dev->sdr_cap_dev);
@@ -1553,6 +1550,7 @@  static int vivid_remove(struct platform_device *pdev)

 #ifdef CONFIG_MEDIA_CONTROLLER
 		media_device_unregister(&dev->mdev);
+		media_device_cleanup(&dev->mdev);
 #endif

 		if (dev->has_vid_cap) {