---

yaml --- r: 307570 b: refs/heads/master c: 5c5ed6e h: refs/heads/master v: v3
git-mirror · May 24, 2012 · 4a967b6 · 4a967b6
1 parent 3f2398f
commit 4a967b6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f3787aa439ae0d34e4658400c1139a7541bec1d
+refs/heads/master: 5c5ed6e2cd8b8f944cc7a27fb8a66b695dccf32f
diff --git a/trunk/drivers/gpu/drm/nouveau/nouveau_state.c b/trunk/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -840,6 +840,7 @@ nouveau_card_init(struct drm_device *dev)
 out_display_early:
 	engine->display.late_takedown(dev);
 out:
+	vga_switcheroo_unregister_client(dev->pdev);
 	vga_client_register(dev->pdev, NULL, NULL, NULL);
 	return ret;
 }
@@ -895,6 +896,7 @@ static void nouveau_card_takedown(struct drm_device *dev)
 
 	nouveau_irq_fini(dev);
 
+	vga_switcheroo_unregister_client(dev->pdev);
 	vga_client_register(dev->pdev, NULL, NULL, NULL);
 }