diff options
author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-20 13:22:15 +0200 |
---|---|---|
committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-20 13:22:15 +0200 |
commit | 55cc33ceb75643d190ed215f423972e0b7ae7aeb (patch) | |
tree | e9573d995bfae0f81ce800433b424bb998f90eca /kernel/power/suspend.c | |
parent | 1f0b63866fc1be700260547be8edf8e6f0af37f2 (diff) | |
parent | f71495f3f0c5f0801823d1235b271a4a415d3df8 (diff) | |
download | linux-55cc33ceb75643d190ed215f423972e0b7ae7aeb.tar.bz2 |
Merge branch 'pm-sleep' into acpi-pm
Diffstat (limited to 'kernel/power/suspend.c')
-rw-r--r-- | kernel/power/suspend.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/power/suspend.c b/kernel/power/suspend.c index 73a905f83972..b62bea0bb624 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c @@ -62,9 +62,11 @@ static void freeze_begin(void) static void freeze_enter(void) { + cpuidle_use_deepest_state(true); cpuidle_resume(); wait_event(suspend_freeze_wait_head, suspend_freeze_wake); cpuidle_pause(); + cpuidle_use_deepest_state(false); } void freeze_wake(void) |