summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Skeggs <bskeggs@redhat.com>2010-03-25 16:01:04 +1000
committerBen Skeggs <bskeggs@redhat.com>2010-04-09 10:15:17 +1000
commita1663ed3412f4b94edcf30b271c9db3ace533605 (patch)
treeb1ae58bb53cb1471b521d832e7942680ec7d3900
parent78bb35129e9400fb50580e971d964563fc8e0218 (diff)
downloadlinux-3.10-a1663ed3412f4b94edcf30b271c9db3ace533605.tar.gz
linux-3.10-a1663ed3412f4b94edcf30b271c9db3ace533605.tar.bz2
linux-3.10-a1663ed3412f4b94edcf30b271c9db3ace533605.zip
drm/nv50: cleanup properly if PDISPLAY init fails
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
-rw-r--r--drivers/gpu/drm/nouveau/nv50_display.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index bd99986a114..fd00f4000f1 100644
--- a/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/drivers/gpu/drm/nouveau/nv50_display.c
@@ -529,8 +529,10 @@ int nv50_display_create(struct drm_device *dev)
}
ret = nv50_display_init(dev);
- if (ret)
+ if (ret) {
+ nv50_display_destroy(dev);
return ret;
+ }
return 0;
}