media: platform: fix some double free in meson-ge2d and mtk-jpeg and s5p-mfc
[ Upstream commit c65c3f3a2c
]
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>
This commit is contained in:
parent
704838040f
commit
fb98ebac01
|
@ -1030,7 +1030,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);
|
||||
|
||||
|
|
|
@ -1411,7 +1411,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);
|
||||
|
||||
|
|
|
@ -1399,6 +1399,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:
|
||||
|
@ -1444,8 +1445,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);
|
||||
|
||||
|
|
Loading…
Reference in New Issue