aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiu Ying <[email protected]>2020-07-09 10:02:35 +0800
committerSam Ravnborg <[email protected]>2020-07-10 20:20:58 +0200
commit2ae53e79f2dec41949d7b089c0b6d7edce292d10 (patch)
tree051e2fcb527a0896f4d40a767c509d51ecfb734d
parent92d75f77e95f2fe6c13569fea04ccdbe277ffe7b (diff)
drm/bridge: dw-hdmi: Don't cleanup i2c adapter and ddc ptr in __dw_hdmi_probe() bailout path
It's unnecessary to cleanup the i2c adapter and the ddc pointer in the bailout path of __dw_hdmi_probe(), since the adapter is not added and the ddc pointer is not set. Fixes: a23d6265f033 ("drm: bridge: dw-hdmi: Extract PHY interrupt setup to a function") Cc: Andrzej Hajda <[email protected]> Cc: Neil Armstrong <[email protected]> Cc: Laurent Pinchart <[email protected]> Cc: Jonas Karlman <[email protected]> Cc: Jernej Skrabec <[email protected]> Cc: David Airlie <[email protected]> Cc: Daniel Vetter <[email protected]> Cc: Boris Brezillon <[email protected]> Cc: Jerome Brunet <[email protected]> Cc: Cheng-Yi Chiang <[email protected]> Cc: Dariusz Marcinkiewicz <[email protected]> Cc: Archit Taneja <[email protected]> Cc: Jose Abreu <[email protected]> Cc: [email protected] Cc: NXP Linux Team <[email protected]> Signed-off-by: Liu Ying <[email protected]> Reviewed-by: Laurent Pinchart <[email protected]> Signed-off-by: Sam Ravnborg <[email protected]> Link: https://patchwork.freedesktop.org/patch/msgid/[email protected]
-rw-r--r--drivers/gpu/drm/bridge/synopsys/dw-hdmi.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
index 6148a022569a..137b6ebfed19 100644
--- a/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
+++ b/drivers/gpu/drm/bridge/synopsys/dw-hdmi.c
@@ -3441,11 +3441,6 @@ __dw_hdmi_probe(struct platform_device *pdev,
return hdmi;
err_iahb:
- if (hdmi->i2c) {
- i2c_del_adapter(&hdmi->i2c->adap);
- hdmi->ddc = NULL;
- }
-
clk_disable_unprepare(hdmi->iahb_clk);
if (hdmi->cec_clk)
clk_disable_unprepare(hdmi->cec_clk);