Bladeren bron

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
Daniel Vetter 9 jaren geleden
bovenliggende
commit
fdf2c85f26
1 gewijzigde bestanden met toevoegingen van 2 en 2 verwijderingen
  1. 2 2
      drivers/gpu/drm/drm_crtc.c

+ 2 - 2
drivers/gpu/drm/drm_crtc.c

@@ -1030,8 +1030,6 @@ int drm_connector_register(struct drm_connector *connector)
 {
 {
 	int ret;
 	int ret;
 
 
-	drm_mode_object_register(connector->dev, &connector->base);
-
 	ret = drm_sysfs_connector_add(connector);
 	ret = drm_sysfs_connector_add(connector);
 	if (ret)
 	if (ret)
 		return ret;
 		return ret;
@@ -1042,6 +1040,8 @@ int drm_connector_register(struct drm_connector *connector)
 		return ret;
 		return ret;
 	}
 	}
 
 
+	drm_mode_object_register(connector->dev, &connector->base);
+
 	return 0;
 	return 0;
 }
 }
 EXPORT_SYMBOL(drm_connector_register);
 EXPORT_SYMBOL(drm_connector_register);