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 41b51f0f13ae..2aff745f0147 100644 --- a/drivers/gpu/drm/display/drm_bridge_connector.c +++ b/drivers/gpu/drm/display/drm_bridge_connector.c @@ -1057,15 +1057,13 @@ drm_bridge_connector_initialize(struct drm_bridge_connector *bridge_connector, &drm_bridge_connector_funcs, &bridge_connector->hdmi_funcs, connector_type, ddc); - if (ret) - return ERR_PTR(ret); } else { ret = drmm_connector_init(drm, connector, &drm_bridge_connector_funcs, connector_type, ddc); - if (ret) - return ERR_PTR(ret); } + if (ret) + return ret; if (bridge_connector->bridge_hdmi_audio || bridge_connector->bridge_dp_audio) { -- 2.55.0
