From c54c6a68331b9d59430025d8c506b3a65b202674 Mon Sep 17 00:00:00 2001
From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 25 Mar 2010 16:01:04 +1000
Subject: [PATCH] --- yaml --- r: 189691 b: refs/heads/master c:
 a1663ed3412f4b94edcf30b271c9db3ace533605 h: refs/heads/master i:   189689:
 0ef9267d4538e82cd29abc8e413e82d47b0b3e48   189687:
 36786b6c7007b4ee2bbb0f88f215598ac31cf1d3 v: v3

---
 [refs]                                       | 2 +-
 trunk/drivers/gpu/drm/nouveau/nv50_display.c | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 6b88d70db1b6..5eadec0cab81 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 78bb35129e9400fb50580e971d964563fc8e0218
+refs/heads/master: a1663ed3412f4b94edcf30b271c9db3ace533605
diff --git a/trunk/drivers/gpu/drm/nouveau/nv50_display.c b/trunk/drivers/gpu/drm/nouveau/nv50_display.c
index bd99986a1146..fd00f4000f14 100644
--- a/trunk/drivers/gpu/drm/nouveau/nv50_display.c
+++ b/trunk/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;
 }