diff options
author | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 11:59:40 -0500 |
---|---|---|
committer | Bjorn Helgaas <bhelgaas@google.com> | 2012-11-09 11:59:40 -0500 |
commit | 13a84687092f47a6d67b1b17940eb3127ae888b3 (patch) | |
tree | 6d6766e6f7721729f60dd4f72fd93c19f97f2248 /drivers/pci/pci-driver.c | |
parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
parent | 6e965e0d0e1d102c261326b06338d3385ea55f97 (diff) |
Merge branch 'pci/misc' into next
* pci/misc:
PCI/PM: Add comments for PME poll support for PCIe
PCI: Add PLX PCI 9050 workaround for some Meilhaus DAQ cards
PCI: Add workaround for PLX PCI 9050 BAR alignment erratum
PCI: Convert dev_printk(KERN_<LEVEL> to dev_<level>(
x86/PCI: Ignore _SEG on HP xw9300
PCI: Don't touch card regs after runtime suspend D3
Diffstat (limited to 'drivers/pci/pci-driver.c')
-rw-r--r-- | drivers/pci/pci-driver.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 94c6e2aa03d6..11d9c8a9d0d0 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c | |||
@@ -1023,10 +1023,10 @@ static int pci_pm_runtime_suspend(struct device *dev) | |||
1023 | return 0; | 1023 | return 0; |
1024 | } | 1024 | } |
1025 | 1025 | ||
1026 | if (!pci_dev->state_saved) | 1026 | if (!pci_dev->state_saved) { |
1027 | pci_save_state(pci_dev); | 1027 | pci_save_state(pci_dev); |
1028 | 1028 | pci_finish_runtime_suspend(pci_dev); | |
1029 | pci_finish_runtime_suspend(pci_dev); | 1029 | } |
1030 | 1030 | ||
1031 | return 0; | 1031 | return 0; |
1032 | } | 1032 | } |