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

Commit 9df630da authored by Miaoqian Lin's avatar Miaoqian Lin Committed by Greg Kroah-Hartman
Browse files

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: 4710b752 ("[media] v4l: Add Renesas R-Car FDP1 Driver")
Signed-off-by: default avatarMiaoqian Lin <linmq006@gmail.com>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
[hverkuil: resolve merge conflict, remove() is now void]
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 6fd6e2f2

drivers/media/platform/rcar_fdp1.c

+8 −3
Original line number Diff line number Diff line
@@ -2317,8 +2317,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);
@@ -2327,7 +2329,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 */
@@ -2397,6 +2399,8 @@ static int fdp1_probe(struct platform_device *pdev) 
unreg_dev:

	v4l2_device_unregister(&fdp1->v4l2_dev);



put_dev:

	rcar_fcp_put(fdp1->fcp);

	return ret;

}
@@ -2408,6 +2412,7 @@ static int 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);



	return 0;

}