Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 12480f75 authored by Christophe JAILLET's avatar Christophe JAILLET Committed by Greg Kroah-Hartman
Browse files

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: d2b4387f ("media: platform: Add Aspeed Video Engine driver")
Signed-off-by: default avatarChristophe JAILLET <christophe.jaillet@wanadoo.fr>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent d2b1dc3a

drivers/media/platform/aspeed-video.c

+2 −2
Original line number Diff line number Diff line
@@ -1688,6 +1688,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;
@@ -1715,8 +1716,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);