[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Message-Id: <20231122-rkisp-fixes-v2-1-78bfb63cdcf8@ideasonboard.com>
Date: Wed, 22 Nov 2023 17:50:07 +0200
From: Tomi Valkeinen <tomi.valkeinen@...asonboard.com>
To: Dafna Hirschfeld <dafna@...tmail.com>,
Laurent Pinchart <laurent.pinchart@...asonboard.com>,
Mauro Carvalho Chehab <mchehab@...nel.org>,
Heiko Stuebner <heiko@...ech.de>,
Jacob Chen <jacob2.chen@...k-chips.com>,
Yichong Zhong <zyc@...k-chips.com>,
Shunqian Zheng <zhengsq@...k-chips.com>,
Paul Elder <paul.elder@...asonboard.com>,
Sakari Ailus <sakari.ailus@...ux.intel.com>
Cc: Kieran Bingham <kieran.bingham@...asonboard.com>,
Hans Verkuil <hverkuil-cisco@...all.nl>,
Eddie Cai <eddie.cai.linux@...il.com>,
Allon Huang <allon.huang@...k-chips.com>,
Jeffy Chen <jeffy.chen@...k-chips.com>,
linux-media@...r.kernel.org, linux-rockchip@...ts.infradead.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
Tomi Valkeinen <tomi.valkeinen@...asonboard.com>,
Tommaso Merciai <tomm.merciai@...il.com>
Subject: [PATCH v2 1/2] media: rkisp1: Fix media device memory leak
Add missing calls to media_device_cleanup() to fix memory leak.
Fixes: d65dd85281fb ("media: staging: rkisp1: add Rockchip ISP1 base driver")
Reviewed-by: Laurent Pinchart <laurent.pinchart@...asonboard.com>
Reviewed-by: Tommaso Merciai <tomm.merciai@...il.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@...asonboard.com>
---
drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c b/drivers/media/platform/rockchip/rkisp1/rkisp1-dev.c
index c41abd2833f1..894d5afaff4e 100644
--- 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 @@ 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);
}
--
2.34.1
Powered by blists - more mailing lists