diff options
| author | Linus Torvalds | 2017-12-15 03:25:03 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2017-12-15 03:25:03 +0100 |
| commit | 032b4cc8ff84490c4bc7c4ef8c91e6d83a637538 (patch) | |
| tree | 754079aaadebe052b28068659556343f92f69647 /include | |
| parent | Merge tag 'trace-v4.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/... (diff) | |
| parent | PM / sleep: Avoid excess pm_runtime_enable() calls in device_resume() (diff) | |
| download | kernel-qcow2-linux-032b4cc8ff84490c4bc7c4ef8c91e6d83a637538.tar.gz kernel-qcow2-linux-032b4cc8ff84490c4bc7c4ef8c91e6d83a637538.tar.xz kernel-qcow2-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 'include')
| -rw-r--r-- | include/linux/pm.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/pm.h b/include/linux/pm.h index 65d39115f06d..492ed473ba7e 100644 --- a/include/linux/pm.h +++ b/include/linux/pm.h @@ -765,6 +765,7 @@ extern int pm_generic_poweroff_late(struct device *dev); extern int pm_generic_poweroff(struct device *dev); extern void pm_generic_complete(struct device *dev); +extern void dev_pm_skip_next_resume_phases(struct device *dev); extern bool dev_pm_smart_suspend_and_suspended(struct device *dev); #else /* !CONFIG_PM_SLEEP */ |