Skip to content

Commit 1a0f69e

Browse files
osamakaderlucaceresoli
authored andcommitted
drm/bridge: synopsys: dw-dp: fix error paths of dw_dp_bind
Fix several issues in dw_dp_bind() error handling: 1. Missing return after drm_bridge_attach() failure - the function continued execution instead of returning an error. 2. Resource leak: drm_dp_aux_register() is not a devm function, so drm_dp_aux_unregister() must be called on all error paths after aux registration succeeds. This affects errors from: - drm_bridge_attach() - phy_init() - devm_add_action_or_reset() - platform_get_irq() - devm_request_threaded_irq() 3. Bug fix: platform_get_irq() returns the IRQ number or a negative error code, but the error path was returning ERR_PTR(ret) instead of ERR_PTR(dp->irq). Use a goto label for cleanup to ensure consistent error handling. Fixes: 86eecc3 ("drm/bridge: synopsys: Add DW DPTX Controller support library") Cc: stable@vger.kernel.org Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com> Reviewed-by: Louis Chauvet <louis.chauvet@bootlin.com> Reviewed-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Link: https://patch.msgid.link/20260102155553.13243-1-osama.abdelkader@gmail.com Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com>
1 parent 8d50870 commit 1a0f69e

1 file changed

Lines changed: 14 additions & 6 deletions

File tree

  • drivers/gpu/drm/bridge/synopsys

drivers/gpu/drm/bridge/synopsys/dw-dp.c

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2062,33 +2062,41 @@ struct dw_dp *dw_dp_bind(struct device *dev, struct drm_encoder *encoder,
20622062
}
20632063

20642064
ret = drm_bridge_attach(encoder, bridge, NULL, DRM_BRIDGE_ATTACH_NO_CONNECTOR);
2065-
if (ret)
2065+
if (ret) {
20662066
dev_err_probe(dev, ret, "Failed to attach bridge\n");
2067+
goto unregister_aux;
2068+
}
20672069

20682070
dw_dp_init_hw(dp);
20692071

20702072
ret = phy_init(dp->phy);
20712073
if (ret) {
20722074
dev_err_probe(dev, ret, "phy init failed\n");
2073-
return ERR_PTR(ret);
2075+
goto unregister_aux;
20742076
}
20752077

20762078
ret = devm_add_action_or_reset(dev, dw_dp_phy_exit, dp);
20772079
if (ret)
2078-
return ERR_PTR(ret);
2080+
goto unregister_aux;
20792081

20802082
dp->irq = platform_get_irq(pdev, 0);
2081-
if (dp->irq < 0)
2082-
return ERR_PTR(ret);
2083+
if (dp->irq < 0) {
2084+
ret = dp->irq;
2085+
goto unregister_aux;
2086+
}
20832087

20842088
ret = devm_request_threaded_irq(dev, dp->irq, NULL, dw_dp_irq,
20852089
IRQF_ONESHOT, dev_name(dev), dp);
20862090
if (ret) {
20872091
dev_err_probe(dev, ret, "failed to request irq\n");
2088-
return ERR_PTR(ret);
2092+
goto unregister_aux;
20892093
}
20902094

20912095
return dp;
2096+
2097+
unregister_aux:
2098+
drm_dp_aux_unregister(&dp->aux);
2099+
return ERR_PTR(ret);
20922100
}
20932101
EXPORT_SYMBOL_GPL(dw_dp_bind);
20942102

0 commit comments

Comments
 (0)