Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma

[karo-tx-linux.git] / drivers / gpu / drm / nouveau / nouveau_state.c

diff --git a/drivers/gpu/drm/nouveau/nouveau_state.c b/drivers/gpu/drm/nouveau/nouveau_state.c
index e23c05348aa02881fb6f298a6572036b4ed34c6b..19706f0532eac60deb973b0b994ad0065a04f980 100644 (file)
--- a/drivers/gpu/drm/nouveau/nouveau_state.c
+++ b/drivers/gpu/drm/nouveau/nouveau_state.c
@@ -840,6 +840,7 @@ out_bios:
 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);
 }