diff options
| author | Johannes Berg <johannes@sipsolutions.net> | 2008-01-11 01:22:23 +0100 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2008-02-01 18:30:58 -0500 |
| commit | af258f516b3e4e214121f5d6d53cab32ce0d8010 (patch) | |
| tree | 9ae8987d51217316aecfc0c04806cc6970cd69e6 /kernel/power | |
| parent | 17b7a89cfb6ea2ff103785f9b2580e5138b6cfd1 (diff) | |
| download | linux-af258f516b3e4e214121f5d6d53cab32ce0d8010.tar.gz linux-af258f516b3e4e214121f5d6d53cab32ce0d8010.tar.bz2 linux-af258f516b3e4e214121f5d6d53cab32ce0d8010.zip | |
Suspend: Invoke suspend notifications after console switch
In order to fix APM emulation it is necessary to enable apm-emulation
notifications for suspends triggered in various ways via the suspend
notifiers. However, this will cause the systems using APM emulation
to lock up between X being needed to switch away from the VT and X
already waiting for resume in the APM ioctl.
This patch moves the console switch (if enabled) before the suspend
notification (and after the resume notification) to avoid this issue.
Signed-off-by: Johannes Berg <johannes@sipsolutions.net>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Len Brown <len.brown@intel.com>
Diffstat (limited to 'kernel/power')
| -rw-r--r-- | kernel/power/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel/power/main.c b/kernel/power/main.c index e47214cfeb2d..6a6d5eb3524e 100644 --- a/kernel/power/main.c +++ b/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(); } |