diff options
| author | Dave Airlie <airlied@redhat.com> | 2014-12-02 07:27:25 +0100 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2014-12-02 07:27:25 +0100 |
| commit | 8b62c8c6df08ca567c78afa51aa7bbc554cede06 (patch) | |
| tree | 0437efe7600040fdec654b79490ba730ec6f34c5 /drivers/gpu | |
| parent | Merge branch 'linux-3.18' of git://anongit.freedesktop.org/git/nouveau/linux-... (diff) | |
| download | linux-8b62c8c6df08ca567c78afa51aa7bbc554cede06.tar.xz linux-8b62c8c6df08ca567c78afa51aa7bbc554cede06.zip | |
nouveau: move the hotplug ignore to correct place.
Introduced in b440bde74f, however it was added to
the wrong function in nouveau.
https://bugzilla.kernel.org/show_bug.cgi?id=86011
Cc: Bjorn Helgaas <bhelgaas@google.com>
CC: stable@vger.kernel.org # v3.15+
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 57238076049f..62b97c4eef8d 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -629,7 +629,6 @@ int nouveau_pmops_suspend(struct device *dev) pci_save_state(pdev); pci_disable_device(pdev); - pci_ignore_hotplug(pdev); pci_set_power_state(pdev, PCI_D3hot); return 0; } @@ -933,6 +932,7 @@ static int nouveau_pmops_runtime_suspend(struct device *dev) ret = nouveau_do_suspend(drm_dev, true); pci_save_state(pdev); pci_disable_device(pdev); + pci_ignore_hotplug(pdev); pci_set_power_state(pdev, PCI_D3cold); drm_dev->switch_power_state = DRM_SWITCH_POWER_DYNAMIC_OFF; return ret; |