From 7c868211157557a4ac7111aecdc49e67b5dd381e Mon Sep 17 00:00:00 2001 From: Johannes Berg Date: Fri, 11 Jan 2008 01:22:23 +0100 Subject: [PATCH] --- yaml --- r: 82397 b: refs/heads/master c: af258f516b3e4e214121f5d6d53cab32ce0d8010 h: refs/heads/master i: 82395: 6607fa708ce6df66bb839f6503a7e78cee6d8de9 v: v3 --- [refs] | 2 +- trunk/kernel/power/main.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 57d4dea4ac9c..431f2045dee5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17b7a89cfb6ea2ff103785f9b2580e5138b6cfd1 +refs/heads/master: af258f516b3e4e214121f5d6d53cab32ce0d8010 diff --git a/trunk/kernel/power/main.c b/trunk/kernel/power/main.c index e47214cfeb2d..6a6d5eb3524e 100644 --- a/trunk/kernel/power/main.c +++ b/trunk/kernel/power/main.c @@ -175,12 +175,12 @@ static int suspend_prepare(void) if (!suspend_ops || !suspend_ops->enter) return -EPERM; + pm_prepare_console(); + error = pm_notifier_call_chain(PM_SUSPEND_PREPARE); if (error) goto Finish; - pm_prepare_console(); - if (suspend_freeze_processes()) { error = -EAGAIN; goto Thaw; @@ -200,9 +200,9 @@ static int suspend_prepare(void) Thaw: suspend_thaw_processes(); - pm_restore_console(); Finish: pm_notifier_call_chain(PM_POST_SUSPEND); + pm_restore_console(); return error; } @@ -309,8 +309,8 @@ int suspend_devices_and_enter(suspend_state_t state) static void suspend_finish(void) { suspend_thaw_processes(); - pm_restore_console(); pm_notifier_call_chain(PM_POST_SUSPEND); + pm_restore_console(); }