diff options
| author | Mark Brown <[email protected]> | 2012-07-22 18:32:00 +0000 |
|---|---|---|
| committer | Mark Brown <[email protected]> | 2012-07-22 18:32:00 +0000 |
| commit | 3384fb98845dc014770caa224d61a2effd258ca5 (patch) | |
| tree | 8189134a4938632e2d06e93af04c9fc1f3c2d4c9 /drivers/pci/pci.c | |
| parent | Merge branches 'regulator-core', 'regulator-dt' and 'regulator-dummy' into re... (diff) | |
| parent | regulator: add new lp8788 regulator driver (diff) | |
| download | kernel-3384fb98845dc014770caa224d61a2effd258ca5.tar.gz kernel-3384fb98845dc014770caa224d61a2effd258ca5.zip | |
Merge branch 'regulator-drivers' into regulator-next
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 77cb54a65cde..447e83472c01 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -1744,11 +1744,6 @@ int pci_prepare_to_sleep(struct pci_dev *dev) if (target_state == PCI_POWER_ERROR) return -EIO; - /* Some devices mustn't be in D3 during system sleep */ - if (target_state == PCI_D3hot && - (dev->dev_flags & PCI_DEV_FLAGS_NO_D3_DURING_SLEEP)) - return 0; - pci_enable_wake(dev, target_state, device_may_wakeup(&dev->dev)); error = pci_set_power_state(dev, target_state); |