summaryrefslogtreecommitdiffstats
path: root/drivers/gpu
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2009-12-22 18:24:09 +0100
committerDave Airlie <airlied@redhat.com>2010-01-11 14:41:09 +1000
commit8f71c29e442e013212a98e2b37eb1074c4d1134f (patch)
treecc8fa3692fb37623a79692d6500af29f7a1536f8 /drivers/gpu
parentb7f7e41b895afd110d1f5121161fd401eccd98c9 (diff)
downloadblackbird-op-linux-8f71c29e442e013212a98e2b37eb1074c4d1134f.tar.gz
blackbird-op-linux-8f71c29e442e013212a98e2b37eb1074c4d1134f.zip
drm/nouveau: Don't skip card take down on nv0x.
Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Diffstat (limited to 'drivers/gpu')
-rw-r--r--drivers/gpu/drm/nouveau/nouveau_state.c4
1 files changed, 2 insertions, 2 deletions
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);
}
OpenPOWER on IntegriCloud