diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 01:41:26 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2017-11-13 01:41:26 +0100 |
| commit | 1efef68262dc567f0c09da9d11924e8287cd3a8b (patch) | |
| tree | ef4534f2683ea2e5bb6b1091d3b910f8d0181fbf /drivers/pci/pci.c | |
| parent | 05d658b5b57214944067fb4f62bce59200bf496f (diff) | |
| parent | 05087360fd7acf2cc9b7bbb243c12765c44c7693 (diff) | |
| download | linux-1efef68262dc567f0c09da9d11924e8287cd3a8b.tar.gz linux-1efef68262dc567f0c09da9d11924e8287cd3a8b.tar.bz2 linux-1efef68262dc567f0c09da9d11924e8287cd3a8b.zip | |
Merge branch 'pm-core'
* pm-core:
ACPI / PM: Take SMART_SUSPEND driver flag into account
PCI / PM: Take SMART_SUSPEND driver flag into account
PCI / PM: Drop unnecessary invocations of pcibios_pm_ops callbacks
PM / core: Add SMART_SUSPEND driver flag
PCI / PM: Use the NEVER_SKIP driver flag
PM / core: Add NEVER_SKIP and SMART_PREPARE driver flags
PM / core: Convert timers to use timer_setup()
PM / core: Fix kerneldoc comments of four functions
PM / core: Drop legacy class suspend/resume operations
Diffstat (limited to 'drivers/pci/pci.c')
| -rw-r--r-- | drivers/pci/pci.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c index 6078dfc11b11..374f5686e2bc 100644 --- a/drivers/pci/pci.c +++ b/drivers/pci/pci.c @@ -2166,8 +2166,7 @@ bool pci_dev_keep_suspended(struct pci_dev *pci_dev) if (!pm_runtime_suspended(dev) || pci_target_state(pci_dev, wakeup) != pci_dev->current_state - || platform_pci_need_resume(pci_dev) - || (pci_dev->dev_flags & PCI_DEV_FLAGS_NEEDS_RESUME)) + || platform_pci_need_resume(pci_dev)) return false; /* |