From: Francisco Jerez <currojerez@riseup.net>
Date: Mon, 18 Oct 2010 01:01:34 +0000 (+0200)
Subject: drm/nouveau: Fix lock unbalance on card take down.
X-Git-Url: http://git.mmlx.us/?a=commitdiff_plain;h=36c952e8b3bad911ef13111058f0a5c4b361027e;p=linux-edison.git

drm/nouveau: Fix lock unbalance on card take down.

Signed-off-by: Francisco Jerez <currojerez@riseup.net>
Signed-off-by: Ben Skeggs <bskeggs@redhat.com>
---

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index 1a4ba6ccafb..af203cc5d7a 100644
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -714,7 +714,7 @@ static void nouveau_card_takedown(struct drm_device *dev)
 
 	if (!engine->graph.accel_blocked) {
 		nouveau_fence_fini(dev);
-		nouveau_channel_put(&dev_priv->channel);
+		nouveau_channel_put_unlocked(&dev_priv->channel);
 	}
 
 	if (!nouveau_noaccel) {