diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-07 10:46:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-07 10:46:30 -0800 |
| commit | e83102cab0fd95d4508361b061146c978b3abd60 (patch) | |
| tree | d1452292bf5d55da6a072d36d507d2e918ee2180 /drivers/pci/pcie/aspm.c | |
| parent | 7f9a50a5b89b87f8e754f59ae9968da28be618a5 (diff) | |
| parent | 5294e256717923f4a3297bb8b802f5e0625763f3 (diff) | |
| download | linux-e83102cab0fd95d4508361b061146c978b3abd60.tar.gz linux-e83102cab0fd95d4508361b061146c978b3abd60.tar.bz2 linux-e83102cab0fd95d4508361b061146c978b3abd60.zip | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jbarnes/pci-2.6:
PCI PM: make the PM core more careful with drivers using the new PM framework
PCI PM: Read power state from device after trying to change it on resume
PCI PM: Do not disable and enable bridges during suspend-resume
PCI: PCIe portdrv: Simplify suspend and resume
PCI PM: Fix saving of device state in pci_legacy_suspend
PCI PM: Check if the state has been saved before trying to restore it
PCI PM: Fix handling of devices without drivers
PCI: return error on failure to read PCI ROMs
PCI: properly clean up ASPM link state on device remove
Diffstat (limited to 'drivers/pci/pcie/aspm.c')
| -rw-r--r-- | drivers/pci/pcie/aspm.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/pci/pcie/aspm.c b/drivers/pci/pcie/aspm.c index 586b6f75910d..b0367f168af4 100644 --- a/drivers/pci/pcie/aspm.c +++ b/drivers/pci/pcie/aspm.c @@ -718,9 +718,9 @@ void pcie_aspm_exit_link_state(struct pci_dev *pdev) /* * All PCIe functions are in one slot, remove one function will remove - * the the whole slot, so just wait + * the whole slot, so just wait until we are the last function left. */ - if (!list_empty(&parent->subordinate->devices)) + if (!list_is_last(&pdev->bus_list, &parent->subordinate->devices)) goto out; /* All functions are removed, so just disable ASPM for the link */ |