diff options
| author |   Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-05-06 14:55:02 +0200 |
|---|---|---|
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | 2016-05-18 12:24:51 +0200 |
| commit | fdf2c85f26a656df3c9ef2114ff508a4be26bbff (patch) | |
| tree | bf78c83b45c2197c0f0ef5c27bfcb179595eb19d /drivers/gpu/drm/drm_crtc.c | |
| parent | drm: Avoid connector reference imbalance on error path (diff) | |
| download | linux-dev-fdf2c85f26a656df3c9ef2114ff508a4be26bbff.tar.xz linux-dev-fdf2c85f26a656df3c9ef2114ff508a4be26bbff.zip | |
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
Diffstat (limited to 'drivers/gpu/drm/drm_crtc.c')
| -rw-r--r-- | drivers/gpu/drm/drm_crtc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/gpu/drm/drm_crtc.c b/drivers/gpu/drm/drm_crtc.c index 70f9c682d144..d2a6d958ca76 100644 --- 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); |