In prepataion to add more error management code common to the HDMI and
non-HDMI branches, move error management to be common to both cases.

Signed-off-by: Luca Ceresoli <[email protected]>
---
 drivers/gpu/drm/display/drm_bridge_connector.c | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/drivers/gpu/drm/display/drm_bridge_connector.c 
b/drivers/gpu/drm/display/drm_bridge_connector.c
index 982bc64d8361..defe29e339b0 100644
--- a/drivers/gpu/drm/display/drm_bridge_connector.c
+++ b/drivers/gpu/drm/display/drm_bridge_connector.c
@@ -1038,15 +1038,13 @@ static int drm_bridge_connector_add_connector(struct 
drm_bridge_connector *bridg
                                               connector_type, ddc,
                                               supported_formats,
                                               max_bpc);
-               if (ret)
-                       return ret;
        } else {
                ret = drmm_connector_init(bridge_connector->drm, connector,
                                          &drm_bridge_connector_funcs,
                                          connector_type, ddc);
-               if (ret)
-                       return ret;
        }
+       if (ret)
+               return ret;
 
        ret = drm_bridge_connector_init_hdmi_audio_cec(bridge_connector);
        if (ret)

-- 
2.54.0

Reply via email to