[PATCH] drm/mediatek: dp: Unregister child devices on probe failure

From: Haoxiang Li

Date: Wed Nov 18 2026 - 21:26:43 EST


If PHY initialization fails after the audio codec device has been
registered, mtk_dp_probe() returns without unregistering the audio
device. Later failures during eDP AUX bus setup, panel linking or
bridge registration also leave the PHY device registered.

Add error labels to unregister successfully registered child devices
in reverse order before returning the probe error.

Fixes: e71a8ebbe086 ("drm/mediatek: dp: Audio support for MT8195")
Fixes: 214a0944e664 ("drm/mediatek: dp: Use devm variant of drm_bridge_add()")
Signed-off-by: Haoxiang Li <haoxiang_li2024@xxxxxxx>
---
drivers/gpu/drm/mediatek/mtk_dp.c | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/drivers/gpu/drm/mediatek/mtk_dp.c b/drivers/gpu/drm/mediatek/mtk_dp.c
index 974c4fff6fd3..5be69622242f 100644
--- a/drivers/gpu/drm/mediatek/mtk_dp.c
+++ b/drivers/gpu/drm/mediatek/mtk_dp.c
@@ -2804,7 +2804,7 @@ static int mtk_dp_probe(struct platform_device *pdev)

ret = mtk_dp_register_phy(mtk_dp);
if (ret)
- return ret;
+ goto err_unregister_audio;

mtk_dp->bridge.of_node = dev->of_node;
mtk_dp->bridge.type = mtk_dp->data->bridge_type;
@@ -2838,27 +2838,37 @@ static int mtk_dp_probe(struct platform_device *pdev)
if (ret == -ENODEV) {
ret = mtk_dp_edp_link_panel(&mtk_dp->aux);
if (ret)
- return ret;
+ goto err_unregister_phy;
} else {
mtk_dp_update_bits(mtk_dp, MTK_DP_TOP_PWR_STATE,
DP_PWR_STATE_BANDGAP_TPLL,
DP_PWR_STATE_MASK);
mtk_dp_power_disable(mtk_dp);
- return ret;
+ goto err_unregister_phy;
}
}
} else {
mtk_dp->bridge.ops = DRM_BRIDGE_OP_DETECT |
DRM_BRIDGE_OP_EDID | DRM_BRIDGE_OP_HPD;
ret = devm_drm_bridge_add(dev, &mtk_dp->bridge);
- if (ret)
- return dev_err_probe(dev, ret, "Failed to add bridge\n");
+ if (ret) {
+ dev_err_probe(dev, ret, "Failed to add bridge\n");
+ goto err_unregister_phy;
+ }
}

pm_runtime_enable(dev);
pm_runtime_get_sync(dev);

return 0;
+
+err_unregister_phy:
+ platform_device_unregister(mtk_dp->phy_dev);
+
+err_unregister_audio:
+ if (mtk_dp->audio_pdev)
+ platform_device_unregister(mtk_dp->audio_pdev);
+ return ret;
}

static void mtk_dp_remove(struct platform_device *pdev)
--
2.25.1