diff options
| author | Hans de Goede <hdegoede@redhat.com> | 2019-05-24 18:35:18 +0200 |
|---|---|---|
| committer | Hans de Goede <hdegoede@redhat.com> | 2019-05-27 10:55:33 +0200 |
| commit | 5c27de1df85066f2801f1ec406e641fdde178151 (patch) | |
| tree | 2bbaa9183341473ee5f67dce465fa6a5064df689 /drivers/gpu/drm/i915/vlv_dsi.c | |
| parent | drm/i915: Update DRIVER_DATE to 20190524 (diff) | |
| download | linux-5c27de1df85066f2801f1ec406e641fdde178151.tar.xz linux-5c27de1df85066f2801f1ec406e641fdde178151.zip | |
drm/i915/dsi: Call drm_connector_cleanup on vlv_dsi_init error exit path
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
Diffstat (limited to '')
| -rw-r--r-- | drivers/gpu/drm/i915/vlv_dsi.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/i915/vlv_dsi.c b/drivers/gpu/drm/i915/vlv_dsi.c index 895ea1a72a69..bfe2891eac37 100644 --- a/drivers/gpu/drm/i915/vlv_dsi.c +++ b/drivers/gpu/drm/i915/vlv_dsi.c @@ -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); |