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

[ Upstream commit 310fda622bbd38be17fb444f7f049b137af3bc0d ]

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: d2b4387f3bdf ("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>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/aspeed-video.c b/drivers/media/platform/aspeed-video.c
index 757a58829a512a21602f7902ee997c631a5e19c5..9d9124308f6adf21000312087e7e146ff921eec8 100644 (file)
--- a/drivers/media/platform/aspeed-video.c
+++ b/drivers/media/platform/aspeed-video.c
@@ -1723,6 +1723,7 @@ static int aspeed_video_probe(struct platform_device *pdev)
 
        rc = aspeed_video_setup_video(video);
        if (rc) {
+               aspeed_video_free_buf(video, &video->jpeg);
                clk_unprepare(video->vclk);
                clk_unprepare(video->eclk);
                return rc;
@@ -1748,8 +1749,7 @@ static int aspeed_video_remove(struct platform_device *pdev)
 
        v4l2_device_unregister(v4l2_dev);
 
-       dma_free_coherent(video->dev, VE_JPEG_HEADER_SIZE, video->jpeg.virt,
-                         video->jpeg.dma);
+       aspeed_video_free_buf(video, &video->jpeg);
 
        of_reserved_mem_device_release(dev);