---

yaml --- r: 179865 b: refs/heads/master c: 111b459 h: refs/heads/master i: 179863: f382038 v: v3
git-mirror · Jan 10, 2010 · ab2f08c · ab2f08c
1 parent 8370a3e
commit ab2f08c
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0829168b474663d8b13f6105368dbbf4a1a03256
+refs/heads/master: 111b459af191891f49682f21e11f348703cd8bdd
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/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);
 }