From: Christophe JAILLET Date: Thu, 11 Nov 2021 13:17:51 +0000 (+0100) Subject: media: mtk-vcodec: Fix an error handling path in 'mtk_vcodec_probe()' X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=615c6f28b9ad7efc9bfbef2cafc6a0c5bc0c21e0;p=uclinux-h8%2Flinux.git 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: 118add98f80e ("media: mtk-vcodec: vdec: add media device if using stateless api") Signed-off-by: Christophe JAILLET Acked-by: Tzung-Bi Shih Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab --- diff --git a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c index 68abb1422c40..5d72fce154d8 100644 --- a/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c +++ b/drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c @@ -358,6 +358,8 @@ err_media_reg: if (dev->vdec_pdata->uses_stateless_api) v4l2_m2m_unregister_media_controller(dev->m2m_dev_dec); err_reg_cont: + if (dev->vdec_pdata->uses_stateless_api) + media_device_cleanup(&dev->mdev_dec); destroy_workqueue(dev->decode_workqueue); err_event_workq: v4l2_m2m_release(dev->m2m_dev_dec);