drop queue-6.12/drm-mediatek-ovl_adaptor-fix-probe-device-leaks.patch

breaks the build

diff --git a/queue-6.12/drm-mediatek-ovl_adaptor-fix-probe-device-leaks.patch b/queue-6.12/drm-mediatek-ovl_adaptor-fix-probe-device-leaks.patch
deleted file mode 100644 (file)
index 0cd31a4..0000000
--- a/queue-6.12/drm-mediatek-ovl_adaptor-fix-probe-device-leaks.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From e0f44f74ed6313e50b38eb39a2c7f210ae208db2 Mon Sep 17 00:00:00 2001
-From: Johan Hovold <johan@kernel.org>
-Date: Tue, 23 Sep 2025 17:23:40 +0200
-Subject: drm/mediatek: ovl_adaptor: Fix probe device leaks
-
-From: Johan Hovold <johan@kernel.org>
-
-commit e0f44f74ed6313e50b38eb39a2c7f210ae208db2 upstream.
-
-Make sure to drop the references taken to the component devices by
-of_find_device_by_node() during probe on probe failure (e.g. probe
-deferral) and on driver unbind.
-
-Fixes: 453c3364632a ("drm/mediatek: Add ovl_adaptor support for MT8195")
-Cc: stable@vger.kernel.org     # 6.4
-Cc: Nancy.Lin <nancy.lin@mediatek.com>
-Signed-off-by: Johan Hovold <johan@kernel.org>
-Reviewed-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
-Link: https://patchwork.kernel.org/project/dri-devel/patch/20250923152340.18234-6-johan@kernel.org/
-Signed-off-by: Chun-Kuang Hu <chunkuang.hu@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c |   12 ++++++++++++
- 1 file changed, 12 insertions(+)
-
---- a/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
-+++ b/drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c
-@@ -497,6 +497,13 @@ static int compare_of(struct device *dev
-       return dev->of_node == data;
- }
- 
-+static void ovl_adaptor_put_device(void *_dev)
-+{
-+      struct device *dev = _dev;
-+
-+      put_device(dev);
-+}
-+
- static int ovl_adaptor_comp_init(struct device *dev, struct component_match **match)
- {
-       struct mtk_disp_ovl_adaptor *priv = dev_get_drvdata(dev);
-@@ -532,6 +539,11 @@ static int ovl_adaptor_comp_init(struct
-               if (!comp_pdev)
-                       return -EPROBE_DEFER;
- 
-+              ret = devm_add_action_or_reset(dev, ovl_adaptor_put_device,
-+                                             &comp_pdev->dev);
-+              if (ret)
-+                      return ret;
-+
-               priv->ovl_adaptor_comp[id] = &comp_pdev->dev;
- 
-               drm_of_component_match_add(dev, match, compare_of, node);

diff --git a/queue-6.12/series b/queue-6.12/series
index 14a4d3a3c765674c5da985ef0d789b5c75220d9f..849e3a1adacf084f69c368f30305a68bac25fa49 100644 (file)
--- a/queue-6.12/series
+++ b/queue-6.12/series
@@ -467,7 +467,6 @@ drm-mediatek-fix-device-node-reference-leak-in-mtk_dp_dt_parse.patch
 drm-mediatek-fix-probe-resource-leaks.patch
 drm-mediatek-fix-probe-memory-leak.patch
 drm-mediatek-fix-probe-device-leaks.patch
-drm-mediatek-ovl_adaptor-fix-probe-device-leaks.patch
 drm-amdkfd-export-the-cwsr_size-and-ctl_stack_size-to-userspace.patch
 drm-amdkfd-bump-minimum-vgpr-size-for-gfx1151.patch
 drm-amdkfd-trap-handler-support-for-expert-scheduling-mode.patch