diff options
| author | Rafael J. Wysocki <rjw@sisk.pl> | 2009-06-14 21:25:02 +0200 |
|---|---|---|
| committer | Jesse Barnes <jbarnes@virtuousgeek.org> | 2009-06-16 14:30:17 -0700 |
| commit | d2abdf62882d982c58e7a6b09ecdcfcc28075e2e (patch) | |
| tree | d43dd7e66f4de4e044ed632a9eb6d61c61019b78 /drivers/pci/pci.c | |
| parent | c12ff1df5f114484e3d8abd028769a624cc3399f (diff) | |
| download | kernel_samsung_smdk4412-d2abdf62882d982c58e7a6b09ecdcfcc28075e2e.zip kernel_samsung_smdk4412-d2abdf62882d982c58e7a6b09ecdcfcc28075e2e.tar.gz kernel_samsung_smdk4412-d2abdf62882d982c58e7a6b09ecdcfcc28075e2e.tar.bz2 | |
PCI PM: Fix handling of devices without PM support by pci_target_state()
If a PCI device is not power-manageable either by the platform, or
with the help of the native PCI PM interface, pci_target_state() will
return either PCI_D3hot, or PCI_POWER_ERROR for it, depending on
whether or not the device is configured to wake up the system. Alas,
none of these return values is correct, because each of them causes
pci_prepare_to_sleep() to return error code, although it should
complete successfully in such a case.
Fix this problem by making pci_target_state() always return PCI_D0
for devices that cannot be power managed.
Cc: stable@kernel.org
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index c56a4a0..7b59fd7 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1284,15 +1284,14 @@ pci_power_t pci_target_state(struct pci_dev *dev) default: target_state = state; } + } else if (!dev->pm_cap) { + target_state = PCI_D0; } else if (device_may_wakeup(&dev->dev)) { /* * Find the deepest state from which the device can generate * wake-up events, make it the target state and enable device * to generate PME#. */ - if (!dev->pm_cap) - return PCI_POWER_ERROR; - if (dev->pme_support) { while (target_state && !(dev->pme_support & (1 << target_state))) |