From ee7e1bda1919ea6edb0fb834f9ae4d12c2ca8c9b Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 15 Jan 2026 16:21:42 +0100 Subject: [PATCH] drop queue-5.15/drm-mediatek-fix-probe-memory-leak.patch breaks the build --- .../drm-mediatek-fix-probe-memory-leak.patch | 44 ------------------- queue-5.15/series | 1 - 2 files changed, 45 deletions(-) delete mode 100644 queue-5.15/drm-mediatek-fix-probe-memory-leak.patch diff --git a/queue-5.15/drm-mediatek-fix-probe-memory-leak.patch b/queue-5.15/drm-mediatek-fix-probe-memory-leak.patch deleted file mode 100644 index d885fcfe95..0000000000 --- a/queue-5.15/drm-mediatek-fix-probe-memory-leak.patch +++ /dev/null @@ -1,44 +0,0 @@ -From stable+bounces-206143-greg=kroah.com@vger.kernel.org Wed Jan 7 13:47:50 2026 -From: Sasha Levin -Date: Wed, 7 Jan 2026 07:46:00 -0500 -Subject: drm/mediatek: Fix probe memory leak -To: stable@vger.kernel.org -Cc: Johan Hovold , CK Hu , AngeloGioacchino Del Regno , Chun-Kuang Hu , Sasha Levin -Message-ID: <20260107124600.3997704-1-sashal@kernel.org> - -From: Johan Hovold - -[ Upstream commit 5e49200593f331cd0629b5376fab9192f698e8ef ] - -The Mediatek DRM driver allocates private data for components without a -platform driver but as the lifetime is tied to each component device, -the memory is never freed. - -Tie the allocation lifetime to the DRM platform device so that the -memory is released on probe failure (e.g. probe deferral) and when the -driver is unbound. - -Fixes: c0d36de868a6 ("drm/mediatek: Move clk info from struct mtk_ddp_comp to sub driver private data") -Cc: stable@vger.kernel.org # 5.12 -Cc: CK Hu -Signed-off-by: Johan Hovold -Reviewed-by: AngeloGioacchino Del Regno -Link: https://patchwork.kernel.org/project/dri-devel/patch/20250923152340.18234-3-johan@kernel.org/ -Signed-off-by: Chun-Kuang Hu -Signed-off-by: Sasha Levin -Signed-off-by: Greg Kroah-Hartman ---- - drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c -+++ b/drivers/gpu/drm/mediatek/mtk_drm_ddp_comp.c -@@ -487,7 +487,7 @@ int mtk_ddp_comp_init(struct device_node - type == MTK_DISP_RDMA) - return 0; - -- priv = devm_kzalloc(comp->dev, sizeof(*priv), GFP_KERNEL); -+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); - if (!priv) - return -ENOMEM; - diff --git a/queue-5.15/series b/queue-5.15/series index 7e327162a6..49ca25df9e 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -477,7 +477,6 @@ lockd-fix-vfs_test_lock-calls.patch asoc-stm-stm32_sai_sub-convert-to-platform-remove-callback-returning-void.patch asoc-stm32-sai-fix-of-node-leak-on-probe.patch wifi-mac80211-discard-beacon-frames-to-non-broadcast-address.patch -drm-mediatek-fix-probe-memory-leak.patch drm-gma500-remove-unused-helper-psb_fbdev_fb_setcolreg.patch net-remove-rtnl-dance-for-siocbraddif-and-siocbrdelif.patch mmc-core-use-sysfs_emit-instead-of-sprintf.patch -- 2.47.3