media: rkisp1: Fix media device memory leak

[ Upstream commit 452f604a4683654f4d9472b3126d8da61d748443 ]

Add missing calls to media_device_cleanup() to fix memory leak.

Link: https://lore.kernel.org/r/20231122-rkisp-fixes-v2-1-78bfb63cdcf8@ideasonboard.com
Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver")
Reviewed-by: Tommaso Merciai <tomm.merciai@gmail.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index c41abd2..894d5af 100644 (file)
--- a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
+++ b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
@@ -582,7 +582,7 @@ static int rkisp1_probe(struct platform_device *pdev)
 
        ret = v4l2_device_register(rkisp1->dev, &rkisp1->v4l2_dev);
        if (ret)
-               goto err_pm_runtime_disable;
+               goto err_media_dev_cleanup;
 
        ret = media_device_register(&rkisp1->media_dev);
        if (ret) {
@@ -617,6 +617,8 @@ err_unreg_media_dev:
        media_device_unregister(&rkisp1->media_dev);
 err_unreg_v4l2_dev:
        v4l2_device_unregister(&rkisp1->v4l2_dev);
+err_media_dev_cleanup:
+       media_device_cleanup(&rkisp1->media_dev);
 err_pm_runtime_disable:
        pm_runtime_disable(&pdev->dev);
        return ret;
@@ -637,6 +639,8 @@ static void rkisp1_remove(struct platform_device *pdev)
        media_device_unregister(&rkisp1->media_dev);
        v4l2_device_unregister(&rkisp1->v4l2_dev);
 
+       media_device_cleanup(&rkisp1->media_dev);
+
        pm_runtime_disable(&pdev->dev);
 }