MLK-19400-1 drm/bridge: sec-dsim: correct one fail branching
authorFancy Fang <chen.fang@nxp.com>
Thu, 30 Aug 2018 07:13:57 +0000 (15:13 +0800)
committerLeonard Crestez <leonard.crestez@nxp.com>
Wed, 17 Apr 2019 23:51:34 +0000 (02:51 +0300)
Obviously, DRM panel prepare is done after the DSIM PLL config,
so when PLL config failed, the 'sec_mipi_dsim_bridge_enable()'
should return directly instead of goto DRM panel unprepare.

Signed-off-by: Fancy Fang <chen.fang@nxp.com>
(cherry picked from commit 9c77865d6ec98ff60a82f03743fd797d082634cc)
(cherry picked from commit a9de06cdd2d8c2a677d687791eb31ad965951ece)

drivers/gpu/drm/bridge/sec-dsim.c

index ec7be9a..902ac0e 100644 (file)
@@ -1187,7 +1187,7 @@ static void sec_mipi_dsim_bridge_enable(struct drm_bridge *bridge)
        ret = sec_mipi_dsim_config_pll(dsim);
        if (ret) {
                dev_err(dsim->dev, "dsim pll config failed: %d\n", ret);
-               goto panel_unprepare;
+               return;
        }
 
        /* config dphy timings */