media: aspeed: Fix an error handling path in aspeed_video_probe()

A dma_free_coherent() call is missing in the error handling path of the
probe, as already done in the remove function.

In fact, this call is included in aspeed_video_free_buf(). So use the
latter both in the error handling path of the probe and in the remove
function.
It is easier to see the relation with aspeed_video_alloc_buf() this way.

Fixes: d2b4387f3b ("media: platform: Add Aspeed Video Engine driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
This commit is contained in:
Christophe JAILLET 2022-03-06 19:08:07 +01:00 коммит произвёл Mauro Carvalho Chehab
Родитель a5e9e202fe
Коммит 310fda622b
1 изменённых файлов: 2 добавлений и 2 удалений

Просмотреть файл

@ -1993,6 +1993,7 @@ static int aspeed_video_probe(struct platform_device *pdev)
rc = aspeed_video_setup_video(video); rc = aspeed_video_setup_video(video);
if (rc) { if (rc) {
aspeed_video_free_buf(video, &video->jpeg);
clk_unprepare(video->vclk); clk_unprepare(video->vclk);
clk_unprepare(video->eclk); clk_unprepare(video->eclk);
return rc; return rc;
@ -2024,8 +2025,7 @@ static int aspeed_video_remove(struct platform_device *pdev)
v4l2_device_unregister(v4l2_dev); v4l2_device_unregister(v4l2_dev);
dma_free_coherent(video->dev, VE_JPEG_HEADER_SIZE, video->jpeg.virt, aspeed_video_free_buf(video, &video->jpeg);
video->jpeg.dma);
of_reserved_mem_device_release(dev); of_reserved_mem_device_release(dev);