Commit 452f604a authored by Tomi Valkeinen's avatar Tomi Valkeinen Committed by Mauro Carvalho Chehab
Browse files

media: rkisp1: Fix media device memory leak 

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: d65dd852 ("media: staging: rkisp1: add Rockchip ISP1 base driver")
Reviewed-by: default avatarTommaso Merciai <tomm.merciai@gmail.com>
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ideasonboard.com>
Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@kernel.org>
parent 25bf28b2

drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c

+5 −1
Original line number Diff line number Diff line
@@ -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 @@ static int rkisp1_probe(struct platform_device *pdev) 
	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);

}