media: platform: fix some double free in meson-ge2d and mtk-jpeg and s5p-mfc

[ Upstream commit c65c3f3a2cbf21ed429d9b9c725bdb5dc6abf4cf ]

video_unregister_device will release device internally. There is no need to
call video_device_release after video_unregister_device.

Signed-off-by: Hangyu Hua <hbh25y@gmail.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/meson/ge2d/ge2d.c b/drivers/media/platform/meson/ge2d/ge2d.c
index a373dea9866bb543d7dc7aff8afbbf231dfa38d1..a885cbc99e3829b4ec2525950628c4b477f710ca 100644 (file)
--- a/drivers/media/platform/meson/ge2d/ge2d.c
+++ b/drivers/media/platform/meson/ge2d/ge2d.c
@@ -1032,7 +1032,6 @@ static int ge2d_remove(struct platform_device *pdev)
 
        video_unregister_device(ge2d->vfd);
        v4l2_m2m_release(ge2d->m2m_dev);
-       video_device_release(ge2d->vfd);
        v4l2_device_unregister(&ge2d->v4l2_dev);
        clk_disable_unprepare(ge2d->clk);
 

diff --git a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
index a89c7b206eefd322fcafd1d6d654bf78c3976afc..470f8f167744845a104fd17e5e849be5cacf7452 100644 (file)
--- a/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
+++ b/drivers/media/platform/mtk-jpeg/mtk_jpeg_core.c
@@ -1457,7 +1457,6 @@ static int mtk_jpeg_remove(struct platform_device *pdev)
 
        pm_runtime_disable(&pdev->dev);
        video_unregister_device(jpeg->vdev);
-       video_device_release(jpeg->vdev);
        v4l2_m2m_release(jpeg->m2m_dev);
        v4l2_device_unregister(&jpeg->v4l2_dev);
        mtk_jpeg_clk_release(jpeg);

diff --git a/drivers/media/platform/s5p-mfc/s5p_mfc.c b/drivers/media/platform/s5p-mfc/s5p_mfc.c
index f336a954327320f9b16f52c85335cdc810220f8b..4fc135d9f38bd43bccc463702acc1c4116ddafef 100644 (file)
--- a/drivers/media/platform/s5p-mfc/s5p_mfc.c
+++ b/drivers/media/platform/s5p-mfc/s5p_mfc.c
@@ -1406,6 +1406,7 @@ static int s5p_mfc_probe(struct platform_device *pdev)
 /* Deinit MFC if probe had failed */
 err_enc_reg:
        video_unregister_device(dev->vfd_dec);
+       dev->vfd_dec = NULL;
 err_dec_reg:
        video_device_release(dev->vfd_enc);
 err_enc_alloc:
@@ -1451,8 +1452,6 @@ static int s5p_mfc_remove(struct platform_device *pdev)
 
        video_unregister_device(dev->vfd_enc);
        video_unregister_device(dev->vfd_dec);
-       video_device_release(dev->vfd_enc);
-       video_device_release(dev->vfd_dec);
        v4l2_device_unregister(&dev->v4l2_dev);
        s5p_mfc_unconfigure_dma_memory(dev);