| Message ID | 86d3e2db237bc35eb55bd46ef07fa13a39bcdff8.1636636541.git.christophe.jaillet@wanadoo.fr (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | media: mtk-vcodec: Fix an error handling path in 'asid_allocator_init()' | expand |
On Thu, Nov 11, 2021 at 02:17:51PM +0100, Christophe JAILLET wrote: > 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 <christophe.jaillet@wanadoo.fr> The commit title looks incorrect: "asid_allocator_init". Except that, Acked-by: Tzung-Bi Shih <tzungbi@google.com>
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 e6e6a8203eeb..8277c44209b5 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 @@ static int mtk_vcodec_probe(struct platform_device *pdev) 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);
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 <christophe.jaillet@wanadoo.fr> --- drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c | 2 ++ 1 file changed, 2 insertions(+)