mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2026-09-22 09:34:56 +02:00
media: aspeed: fix missing of_reserved_mem_device_release() on probe failure
commit253c8ef7d5upstream. aspeed_video_init() calls of_reserved_mem_device_init() to associate reserved memory regions with the device. When aspeed_video_setup_video() subsequently fails in aspeed_video_probe(), the error path frees the JPEG buffer and unprepares the clocks but does not release the reserved memory association, leaking the rmem_assigned_device entry on the global list. The normal remove path already calls of_reserved_mem_device_release() correctly; only the probe error path was missing it. Add the missing of_reserved_mem_device_release() call to the aspeed_video_setup_video() failure cleanup. Fixes:d2b4387f3b("media: platform: Add Aspeed Video Engine driver") Cc: stable@vger.kernel.org Signed-off-by: David Carlier <devnexen@gmail.com> Signed-off-by: Hans Verkuil <hverkuil+cisco@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
877686a74e
commit
f522a7f05f
@@ -2193,6 +2193,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);
|
||||
of_reserved_mem_device_release(&pdev->dev);
|
||||
clk_unprepare(video->vclk);
|
||||
clk_unprepare(video->eclk);
|
||||
return rc;
|
||||
|
||||
Reference in New Issue
Block a user