diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-06 19:50:57 -0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-05-06 19:50:57 -0400 |
| commit | aa9abe2c8eddf426c9b89757129b132c484ee223 (patch) | |
| tree | 1950d527609f6236405193495a410526a7eb19ea /kernel/power | |
| parent | 2c730785d9532d2a9c46e059bd6a6c9a764c539f (diff) | |
| parent | a6220fc19afc07fe77cfd16f5b8e568615517091 (diff) | |
Merge branch 'pm-cpuidle' into pm-sleep
Diffstat (limited to 'kernel/power')
| -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 8233cd4047d7..155721f7f909 100644 --- a/kernel/power/suspend.c +++ b/kernel/power/suspend.c | |||
| @@ -54,9 +54,11 @@ static void freeze_begin(void) | |||
| 54 | 54 | ||
| 55 | static void freeze_enter(void) | 55 | static void freeze_enter(void) |
| 56 | { | 56 | { |
| 57 | cpuidle_use_deepest_state(true); | ||
| 57 | cpuidle_resume(); | 58 | cpuidle_resume(); |
| 58 | wait_event(suspend_freeze_wait_head, suspend_freeze_wake); | 59 | wait_event(suspend_freeze_wait_head, suspend_freeze_wake); |
| 59 | cpuidle_pause(); | 60 | cpuidle_pause(); |
| 61 | cpuidle_use_deepest_state(false); | ||
| 60 | } | 62 | } |
| 61 | 63 | ||
| 62 | void freeze_wake(void) | 64 | void freeze_wake(void) |