drop queue-5.10/media-rkisp1-fix-media-device-memory-leak.patch

diff --git a/queue-5.10/media-rkisp1-fix-media-device-memory-leak.patch b/queue-5.10/media-rkisp1-fix-media-device-memory-leak.patch
deleted file mode 100644 (file)
index 21e503a..0000000
--- a/queue-5.10/media-rkisp1-fix-media-device-memory-leak.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-From 5b7e2370560b8a6ce5f3b72ae431f12b0e27b7de Mon Sep 17 00:00:00 2001
-From: Sasha Levin <sashal@kernel.org>
-Date: Wed, 22 Nov 2023 16:50:07 +0100
-Subject: media: rkisp1: Fix media device memory leak
-
-From: Tomi Valkeinen <tomi.valkeinen@ideasonboard.com>
-
-[ 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>
----
- drivers/staging/media/rkisp1/rkisp1-dev.c | 6 +++++-
- 1 file changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/drivers/staging/media/rkisp1/rkisp1-dev.c b/drivers/staging/media/rkisp1/rkisp1-dev.c
-index 663b2efec9b0..a43eda2a6d2e 100644
---- a/drivers/staging/media/rkisp1/rkisp1-dev.c
-+++ b/drivers/staging/media/rkisp1/rkisp1-dev.c
-@@ -518,7 +518,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) {
-@@ -538,6 +538,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;
-@@ -559,6 +561,8 @@ static int 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);
- 
-       debugfs_remove_recursive(rkisp1->debug.debugfs_dir);
--- 
-2.43.0
-

diff --git a/queue-5.10/series b/queue-5.10/series
index c05b0759d877597003fea53fdb7cce5ce3229c2e..c77f51e0038636b6bec854c10b232c816e2ff923 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -164,7 +164,6 @@ drm-bridge-tc358767-fix-return-value-on-error-case.patch
 media-cx231xx-fix-a-memleak-in-cx231xx_init_isoc.patch
 clk-qcom-gpucc-sm8150-update-the-gpu_cc_pll1-config.patch
 media-rkisp1-disable-runtime-pm-in-probe-error-path.patch
-media-rkisp1-fix-media-device-memory-leak.patch
 f2fs-fix-to-check-compress-file-in-f2fs_move_file_ra.patch
 f2fs-fix-to-update-iostat-correctly-in-f2fs_filemap_.patch
 media-dvbdev-drop-refcount-on-error-path-in-dvb_devi.patch