---

yaml --- r: 228531 b: refs/heads/master c: 36c952e h: refs/heads/master i: 228529: 236ecb3 228527: 9d8ceab v: v3
git-mirror · Dec 3, 2010 · c277b6c · c277b6c
1 parent e37687b
commit c277b6c
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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) {