diff options
| author | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-04-03 22:00:13 +0200 |
|---|---|---|
| committer | Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> | 2013-04-03 22:01:55 +0200 |
| commit | e382a4b9de187ee771c313ac3f38fa006bf5facc (patch) | |
| tree | 94f4c038d80818c893563e4936b446d54ecbc5c6 | |
| parent | 4ea13eb3928f06948f4af78430a9f3aac655a894 (diff) | |
| download | kernel_goldelico_gta04-e382a4b9de187ee771c313ac3f38fa006bf5facc.zip kernel_goldelico_gta04-e382a4b9de187ee771c313ac3f38fa006bf5facc.tar.gz kernel_goldelico_gta04-e382a4b9de187ee771c313ac3f38fa006bf5facc.tar.bz2 | |
MERGE WITH: PM: earlysuspend: Add console switch when user requested sleep state changes.
Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
| -rw-r--r-- | kernel/power/consoleearlysuspend.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/power/consoleearlysuspend.c b/kernel/power/consoleearlysuspend.c index a8befb4..a89c132 100644 --- a/kernel/power/consoleearlysuspend.c +++ b/kernel/power/consoleearlysuspend.c @@ -25,28 +25,29 @@ static int orig_fgconsole; static void console_early_suspend(struct early_suspend *h) { - acquire_console_sem(); + console_lock(); orig_fgconsole = fg_console; if (vc_allocate(EARLY_SUSPEND_CONSOLE)) goto err; if (set_console(EARLY_SUSPEND_CONSOLE)) goto err; - release_console_sem(); + console_unlock(); if (vt_waitactive(EARLY_SUSPEND_CONSOLE)) pr_warning("console_early_suspend: Can't switch VCs.\n"); return; err: pr_warning("console_early_suspend: Can't set console\n"); - release_console_sem(); + console_unlock(); } static void console_late_resume(struct early_suspend *h) { int ret; - acquire_console_sem(); + console_lock(); ret = set_console(orig_fgconsole); - release_console_sem(); + console_unlock(); + if (ret) { pr_warning("console_late_resume: Can't set console.\n"); return; |