aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2019-06-29 19:29:45 +0800
committerLinus Torvalds <torvalds@linux-foundation.org>2019-06-29 19:29:45 +0800
commit2407e486066b8ce00dabd7e2b3a2cbcc59ea6186 (patch)
tree5e4fcdb178bcb824f8b3af6742b4221c3a889935 /kernel
parent01305db842e1e637944090a3de7e4259c4a3a029 (diff)
parent471a739a47aa7d582f0cdf9d392957d04632bae2 (diff)
downloadtip-2407e486066b8ce00dabd7e2b3a2cbcc59ea6186.tar.gz
tip-2407e486066b8ce00dabd7e2b3a2cbcc59ea6186.tar.xz
tip-2407e486066b8ce00dabd7e2b3a2cbcc59ea6186.zip
Merge tag 'pm-5.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull power management fix from Rafael Wysocki: "Avoid skipping bus-level PCI power management during system resume for PCIe ports left in D0 during the preceding suspend transition on platforms where the power states of those ports can change out of the PCI layer's control" * tag 'pm-5.2-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm: PCI: PM: Avoid skipping bus-level PM on platforms without ACPI
Diffstat (limited to 'kernel')
-rw-r--r--kernel/power/suspend.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c
index 9505101ed2bc..096211299c07 100644
--- a/kernel/power/suspend.c
+++ b/kernel/power/suspend.c
@@ -493,6 +493,9 @@ int suspend_devices_and_enter(suspend_state_t state)
pm_suspend_target_state = state;
+ if (state == PM_SUSPEND_TO_IDLE)
+ pm_set_suspend_no_platform();
+
error = platform_suspend_begin(state);
if (error)
goto Close;