From 2a0944f8fc8d9a46ab7a15cb439ead805bb4fce9 Mon Sep 17 00:00:00 2001
From: Marcin Slusarz <marcin.slusarz@gmail.com>
Date: Sun, 15 Apr 2012 14:36:08 +0200
Subject: [PATCH] --- yaml --- r: 307535 b: refs/heads/master c:
 5ace2c9d6f5bc4600ca43fe188a33efc4c2dba79 h: refs/heads/master i:   307533:
 6bccf7f5e0b8187e862aecd25f000cd80ef5be0d   307531:
 133c59839b31113dd58d296c144dcd9c5f6b5efb   307527:
 866f99f6451c5d820b11415815d909f9fb908a06   307519:
 1a881a7da1c92df2d8c5e7406f7db56f7c1ad533 v: v3

---
 [refs]                                          |  2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_display.c | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index d83e5722617e..11d2df852231 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d37f60c87fbf9dca6724ed42fd55b031f88dd46a
+refs/heads/master: 5ace2c9d6f5bc4600ca43fe188a33efc4c2dba79
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_display.c b/trunk/drivers/gpu/drm/nouveau/nouveau_display.c
index b670b0d34233..980b3e187b72 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_display.c
+++ b/trunk/drivers/gpu/drm/nouveau/nouveau_display.c
@@ -325,14 +325,21 @@ nouveau_display_create(struct drm_device *dev)
 
 	ret = disp->create(dev);
 	if (ret)
-		return ret;
+		goto disp_create_err;
 
 	if (dev->mode_config.num_crtc) {
 		ret = drm_vblank_init(dev, dev->mode_config.num_crtc);
 		if (ret)
-			return ret;
+			goto vblank_err;
 	}
 
+	return 0;
+
+vblank_err:
+	disp->destroy(dev);
+disp_create_err:
+	drm_kms_helper_poll_fini(dev);
+	drm_mode_config_cleanup(dev);
 	return ret;
 }