From b28a6a111c2c4779f92f310cfefe10606df4999f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Arve=20Hj=C3=B8nnev=C3=A5g?= Date: Mon, 14 Dec 2009 22:14:52 -0800 Subject: [PATCH 026/696] consoleearlysuspend: Fix for 2.6.32 vt_waitactive now needs a 1 based console number Change-Id: I07ab9a3773c93d67c09d928c8d5494ce823ffa2e --- kernel/power/consoleearlysuspend.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kernel/power/consoleearlysuspend.c b/kernel/power/consoleearlysuspend.c index a8befb4..a3edcb2 100644 --- a/kernel/power/consoleearlysuspend.c +++ b/kernel/power/consoleearlysuspend.c @@ -33,7 +33,7 @@ static void console_early_suspend(struct early_suspend *h) goto err; release_console_sem(); - if (vt_waitactive(EARLY_SUSPEND_CONSOLE)) + if (vt_waitactive(EARLY_SUSPEND_CONSOLE + 1)) pr_warning("console_early_suspend: Can't switch VCs.\n"); return; err: @@ -52,7 +52,7 @@ static void console_late_resume(struct early_suspend *h) return; } - if (vt_waitactive(orig_fgconsole)) + if (vt_waitactive(orig_fgconsole + 1)) pr_warning("console_late_resume: Can't switch VCs.\n"); } -- 1.7.1