diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-15 13:18:36 -0600 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2014-09-15 13:18:36 -0600 |
| commit | 6de8eee17a324a4fd8d1a4588a18e976b68f330c (patch) | |
| tree | 153ab542d89e5905badb062d106b7739de5852d2 /drivers/gpu/drm/nouveau/nouveau_drm.c | |
| parent | fd7155fc9fca6464a5aa668965a3741b963f805f (diff) | |
| parent | f91ce35e471ae17552ce7bfe355cfd997e3ad781 (diff) | |
Merge branch 'pci/hotplug-vga' into for-linus
* pci/hotplug-vga:
ACPIPHP / radeon / nouveau: Remove acpi_bus_no_hotplug()
PCI: Add pci_ignore_hotplug() to ignore hotplug events for a device
Diffstat (limited to 'drivers/gpu/drm/nouveau/nouveau_drm.c')
| -rw-r--r-- | drivers/gpu/drm/nouveau/nouveau_drm.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/gpu/drm/nouveau/nouveau_drm.c b/drivers/gpu/drm/nouveau/nouveau_drm.c index 250a5e88c751..9c3af96a7153 100644 --- a/drivers/gpu/drm/nouveau/nouveau_drm.c +++ b/drivers/gpu/drm/nouveau/nouveau_drm.c @@ -627,6 +627,7 @@ 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; } |