diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-14 18:25:03 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-12-14 18:25:03 -0800 |
| commit | 032b4cc8ff84490c4bc7c4ef8c91e6d83a637538 (patch) | |
| tree | 754079aaadebe052b28068659556343f92f69647 /drivers/pci | |
| parent | 04243787812cabb57726e50d8288a3dcacf54ad2 (diff) | |
| parent | 3487972d7fa6c5143951436ada5933dcf0ec659d (diff) | |
| download | linux-032b4cc8ff84490c4bc7c4ef8c91e6d83a637538.tar.gz linux-032b4cc8ff84490c4bc7c4ef8c91e6d83a637538.tar.bz2 linux-032b4cc8ff84490c4bc7c4ef8c91e6d83a637538.zip | |
Merge tag 'pm-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki:
"This fixes an issue in two recent commits that may cause
pm_runtime_enable() to be called for too many times for some devices
during the "thaw" transition belonging to hibernation"
* tag 'pm-4.15-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
PM / sleep: Avoid excess pm_runtime_enable() calls in device_resume()
Diffstat (limited to 'drivers/pci')
| -rw-r--r-- | drivers/pci/pci-driver.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/pci-driver.c b/drivers/pci/pci-driver.c index 7f47bb72bf30..945099d49f8f 100644 --- a/drivers/pci/pci-driver.c +++ b/drivers/pci/pci-driver.c @@ -999,7 +999,7 @@ static int pci_pm_thaw_noirq(struct device *dev) * the subsequent "thaw" callbacks for the device. */ if (dev_pm_smart_suspend_and_suspended(dev)) { - dev->power.direct_complete = true; + dev_pm_skip_next_resume_phases(dev); return 0; } |