mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 18:39:59 +00:00
media: vivid: two unregistration fixes
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> Signed-off-by: Mauro Carvalho Chehab <mchehab+samsung@kernel.org>
This commit is contained in:
parent
dd1df35dd0
commit
959bba1342
1 changed files with 1 additions and 3 deletions
|
@ -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) {
|
||||
|
|
Loading…
Reference in a new issue