drm: Fix error handling in drm_connector_register
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 6 May 2016 12:55:02 +0000 (14:55 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 18 May 2016 10:24:51 +0000 (12:24 +0200)
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
drivers/gpu/drm/drm_crtc.c

index 70f9c68..d2a6d95 100644 (file)
@@ -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);