drm: Fix error handling in drm_connector_register

When debugfs or sysfs registration failed, we failed to clean up the
idr registration. Reorder to fix this.

Cc: Dave Airlie <airlied@gmail.com>
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
Link: http://patchwork.freedesktop.org/patch/msgid/1462539302-27764-1-git-send-email-daniel.vetter@ffwll.ch

diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c
index 70f9c682d14493cdf24ba417ced3add8fb464fc2..d2a6d958ca76068bf45b59e98dbe2a709ecf8817 100644 (file)
--- a/drivers/gpu/drm/drm_crtc.c
+++ b/drivers/gpu/drm/drm_crtc.c
@@ -1030,8 +1030,6 @@ int drm_connector_register(struct drm_connector *connector)
 {
        int ret;
 
-       drm_mode_object_register(connector->dev, &connector->base);
-
        ret = drm_sysfs_connector_add(connector);
        if (ret)
                return ret;
@@ -1042,6 +1040,8 @@ int drm_connector_register(struct drm_connector *connector)
                return ret;
        }
 
+       drm_mode_object_register(connector->dev, &connector->base);
+
        return 0;
 }
 EXPORT_SYMBOL(drm_connector_register);