summaryrefslogtreecommitdiff
path: root/drivers/media
diff options
context:
space:
mode:
authorChristophe JAILLET <christophe.jaillet@wanadoo.fr>2021-11-11 16:17:51 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2021-11-30 14:07:53 +0300
commit615c6f28b9ad7efc9bfbef2cafc6a0c5bc0c21e0 (patch)
tree8fc76548e7034d4256d8bf7ce7b8632d9884e1d2 /drivers/media
parent89ab2d39643e5ce2b122baa1e76176d1bd984cec (diff)
downloadlinux-615c6f28b9ad7efc9bfbef2cafc6a0c5bc0c21e0.tar.xz
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 <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>
Diffstat (limited to 'drivers/media')
-rw-r--r--drivers/media/platform/mtk-vcodec/mtk_vcodec_dec_drv.c2
1 files changed, 2 insertions, 0 deletions
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);