From: Ben Skeggs <bskeggs@redhat.com>
Date: Thu, 25 Mar 2010 06:01:04 +0000 (+1000)
Subject: drm/nv50: cleanup properly if PDISPLAY init fails
X-Git-Tag: v2.6.34-rc4~12^2^2~10
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=a1663ed3412f4b94edcf30b271c9db3ace533605;p=linux-pvops.git

drm/nv50: cleanup properly if PDISPLAY init fails

Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nv50_display.c b/drivers/gpu/drm/nouveau/nv50_display.c
index bd99986a1146..fd00f4000f14 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;
 }