drop queue-5.15/media-platform-exynos4-is-fix-an-of-node-reference-leak-in-fimc_md_is...

diff --git a/queue-5.15/media-platform-exynos4-is-fix-an-of-node-reference-leak-in-fimc_md_is_isp_available.patch b/queue-5.15/media-platform-exynos4-is-fix-an-of-node-reference-leak-in-fimc_md_is_isp_available.patch
deleted file mode 100644 (file)
index bafd3b8..0000000
--- a/queue-5.15/media-platform-exynos4-is-fix-an-of-node-reference-leak-in-fimc_md_is_isp_available.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 8964eb23408243ae0016d1f8473c76f64ff25d20 Mon Sep 17 00:00:00 2001
-From: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
-Date: Mon, 4 Nov 2024 19:01:19 +0900
-Subject: media: platform: exynos4-is: Fix an OF node reference leak in fimc_md_is_isp_available
-
-From: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
-
-commit 8964eb23408243ae0016d1f8473c76f64ff25d20 upstream.
-
-In fimc_md_is_isp_available(), of_get_child_by_name() is called to check
-if FIMC-IS is available. Current code does not decrement the refcount of
-the returned device node, which causes an OF node reference leak. Fix it
-by calling of_node_put() at the end of the variable scope.
-
-Signed-off-by: Joe Hattori <joe@pf.is.s.u-tokyo.ac.jp>
-Fixes: e781bbe3fecf ("[media] exynos4-is: Add fimc-is subdevs registration")
-Cc: stable@vger.kernel.org
-Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
-Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
-[hverkuil: added CC to stable]
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/media/platform/exynos4-is/media-dev.h |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
---- a/drivers/media/platform/exynos4-is/media-dev.h
-+++ b/drivers/media/platform/exynos4-is/media-dev.h
-@@ -179,8 +179,9 @@ int fimc_md_set_camclk(struct v4l2_subde
- #ifdef CONFIG_OF
- static inline bool fimc_md_is_isp_available(struct device_node *node)
- {
--      node = of_get_child_by_name(node, FIMC_IS_OF_NODE_NAME);
--      return node ? of_device_is_available(node) : false;
-+      struct device_node *child __free(device_node) =
-+              of_get_child_by_name(node, FIMC_IS_OF_NODE_NAME);
-+      return child ? of_device_is_available(child) : false;
- }
- #else
- #define fimc_md_is_isp_available(node) (false)

diff --git a/queue-5.15/series b/queue-5.15/series
index ed975a47cf72ab7f574da6b22ef660a32ef5c09f..d54d3d31d154d63d93099d79392f6ee2f2e3219c 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -3,7 +3,6 @@ media-imx-jpeg-set-video-drvdata-before-register-video-device.patch
 media-i2c-tc358743-fix-crash-in-the-probe-error-path-when-using-polling.patch
 media-imx-jpeg-ensure-power-suppliers-be-suspended-before-detach-them.patch
 media-ts2020-fix-null-ptr-deref-in-ts2020_probe.patch
-media-platform-exynos4-is-fix-an-of-node-reference-leak-in-fimc_md_is_isp_available.patch
 media-venus-fix-pm_runtime_set_suspended-with-runtime-pm-enabled.patch
 media-gspca-ov534-ov772x-fix-off-by-one-error-in-set_frame_rate.patch
 media-platform-allegro-dvt-fix-possible-memory-leak-in-allocate_buffers_internal.patch