From c277b6cb6ad474760b4496797fabc47430b2be1b Mon Sep 17 00:00:00 2001
From: Francisco Jerez <currojerez@riseup.net>
Date: Mon, 18 Oct 2010 03:01:34 +0200
Subject: [PATCH] --- yaml --- r: 228531 b: refs/heads/master c:
 36c952e8b3bad911ef13111058f0a5c4b361027e h: refs/heads/master i:   228529:
 236ecb30e17515bd55427b1c404e44ebbffccac7   228527:
 9d8ceab40a1f7c331a85814378f0c76fae389682 v: v3

---
 [refs]                                        | 2 +-
 trunk/drivers/gpu/drm/nouveau/nouveau_state.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 0f600b2acadf..32d07465c5e1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: feeb0aecfb73b5b7699c0a85ba1650e6f9c50be2
+refs/heads/master: 36c952e8b3bad911ef13111058f0a5c4b361027e
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c
index 1a4ba6ccafb1..af203cc5d7ad 100644
--- a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/trunk/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) {