From ab2f08cc93dfcd33a2c4dd6e99b2cbbae44fb5a6 Mon Sep 17 00:00:00 2001 From: Francisco Jerez Date: Tue, 22 Dec 2009 18:24:09 +0100 Subject: [PATCH] --- yaml --- r: 179865 b: refs/heads/master c: 111b459af191891f49682f21e11f348703cd8bdd h: refs/heads/master i: 179863: f3820385dd0ebe91c66fd9949a1d6a27d36278bc v: v3 --- [refs] | 2 +- trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a94f9ac7efc4..c2eff41c0782 100644 --- 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 index 6a459139910f..a6b573e89829 100644 --- 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); }