summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--kernel/power/consoleearlysuspend.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/power/consoleearlysuspend.c b/kernel/power/consoleearlysuspend.c
index a3edcb26738..3f0c8685fe1 100644
--- a/kernel/power/consoleearlysuspend.c
+++ b/kernel/power/consoleearlysuspend.c
@@ -25,28 +25,28 @@
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 + 1))
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;