UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

media: mtk-vcodec: Fix an error handling path in 'mtk_vcodec_probe()' 

In case of error the 'media_device_init()' call is not balanced by a
corresponding 'media_device_cleanup()' call.

Add it, when needed, as already done in the remove function.

Fixes: 118add98f8 ("media: mtk-vcodec: vdec: add media device if using stateless api")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Acked-by: Tzung-Bi Shih <tzungbi@google.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
This commit is contained in:
Christophe JAILLET 2021-11-11 14:17:51 +01:00 committed by Mauro Carvalho Chehab
parent 89ab2d3964
commit 615c6f28b9
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c
View File

@ -358,6 +358,8 @@ err_media_reg:
if (dev->vdec_pdata->uses_stateless_api) if (dev->vdec_pdata->uses_stateless_api)
v4l2_m2m_unregister_media_controller(dev->m2m_dev_dec); v4l2_m2m_unregister_media_controller(dev->m2m_dev_dec);
err_reg_cont: err_reg_cont:
if (dev->vdec_pdata->uses_stateless_api)
media_device_cleanup(&dev->mdev_dec);
destroy_workqueue(dev->decode_workqueue); destroy_workqueue(dev->decode_workqueue);
err_event_workq: err_event_workq:
v4l2_m2m_release(dev->m2m_dev_dec); v4l2_m2m_release(dev->m2m_dev_dec);