media: rcar_fdp1: Fix refcount leak in probe and remove function

[ Upstream commit c766c90faf93897b77c9c5daa603cffab85ba907 ]

rcar_fcp_get() take reference, which should be balanced with
rcar_fcp_put(). Add missing rcar_fcp_put() in fdp1_remove and
the error paths of fdp1_probe() to fix this.

Fixes: 4710b752e029 ("[media] v4l: Add Renesas R-Car FDP1 Driver")
Signed-off-by: Miaoqian Lin <linmq006@gmail.com>
Reviewed-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[hverkuil: resolve merge conflict, remove() is now void]
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/media/platform/renesas/rcar_fdp1.c b/drivers/media/platform/renesas/rcar_fdp1.c
index d80b3214dfae17c9ae665689faa05304daffd806..c548cb01957b080f7de4bd18bfda492eed9aefc1 100644 (file)
--- a/drivers/media/platform/renesas/rcar_fdp1.c
+++ b/drivers/media/platform/renesas/rcar_fdp1.c
@@ -2313,8 +2313,10 @@ static int fdp1_probe(struct platform_device *pdev)
 
        /* Determine our clock rate */
        clk = clk_get(&pdev->dev, NULL);
-       if (IS_ERR(clk))
-               return PTR_ERR(clk);
+       if (IS_ERR(clk)) {
+               ret = PTR_ERR(clk);
+               goto put_dev;
+       }
 
        fdp1->clk_rate = clk_get_rate(clk);
        clk_put(clk);
@@ -2323,7 +2325,7 @@ static int fdp1_probe(struct platform_device *pdev)
        ret = v4l2_device_register(&pdev->dev, &fdp1->v4l2_dev);
        if (ret) {
                v4l2_err(&fdp1->v4l2_dev, "Failed to register video device\n");
-               return ret;
+               goto put_dev;
        }
 
        /* M2M registration */
@@ -2393,6 +2395,8 @@ release_m2m:
 unreg_dev:
        v4l2_device_unregister(&fdp1->v4l2_dev);
 
+put_dev:
+       rcar_fcp_put(fdp1->fcp);
        return ret;
 }
 
@@ -2404,6 +2408,7 @@ static void fdp1_remove(struct platform_device *pdev)
        video_unregister_device(&fdp1->vfd);
        v4l2_device_unregister(&fdp1->v4l2_dev);
        pm_runtime_disable(&pdev->dev);
+       rcar_fcp_put(fdp1->fcp);
 }
 
 static int __maybe_unused fdp1_pm_runtime_suspend(struct device *dev)