From: Francisco Jerez <currojerez@riseup.net>
Date: Tue, 22 Dec 2009 17:24:09 +0000 (+0100)
Subject: drm/nouveau: Don't skip card take down on nv0x.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=8f71c29e442e013212a98e2b37eb1074c4d1134f;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

drm/nouveau: Don't skip card take down on nv0x.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 6a459139910f..a6b573e89829 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -722,8 +722,8 @@ static void nouveau_close(struct drm_device *dev)
 {
 	struct drm_nouveau_private *dev_priv = dev->dev_private;
 
-	/* In the case of an error dev_priv may not be be allocated yet */
-	if (dev_priv && dev_priv->card_type)
+	/* In the case of an error dev_priv may not be allocated yet */
+	if (dev_priv)
 		nouveau_card_takedown(dev);
 }