OSDN Git Service

drm/i915/dsi: Call drm_connector_cleanup on vlv_dsi_init error exit path
authorHans de Goede <hdegoede@redhat.com>
Fri, 24 May 2019 16:35:18 +0000 (18:35 +0200)
committerHans de Goede <hdegoede@redhat.com>
Mon, 27 May 2019 08:55:33 +0000 (10:55 +0200)
If we exit vlv_dsi_init() because we failed to find a fixed_mode, then
we've already called drm_connector_init() and we should call
drm_connector_cleanup() to unregister the connector object.

Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/20190524163518.17545-1-hdegoede@redhat.com
drivers/gpu/drm/i915/vlv_dsi.c

index 895ea1a..bfe2891 100644 (file)
@@ -1793,7 +1793,7 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
 
        if (!fixed_mode) {
                DRM_DEBUG_KMS("no fixed mode\n");
-               goto err;
+               goto err_cleanup_connector;
        }
 
        intel_panel_init(&intel_connector->panel, fixed_mode, NULL);
@@ -1803,6 +1803,8 @@ void vlv_dsi_init(struct drm_i915_private *dev_priv)
 
        return;
 
+err_cleanup_connector:
+       drm_connector_cleanup(&intel_connector->base);
 err:
        drm_encoder_cleanup(&intel_encoder->base);
        kfree(intel_dsi);