From: Arve Hjønnevåg <arve@android.com>
Date: Tue, 15 Dec 2009 06:14:52 +0000 (-0800)
Subject: consoleearlysuspend: Fix for 2.6.32
X-Git-Tag: firefly_0821_release~9833^2~5^2~335
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e1310abde57e42211413608d060242a7c50f30ec;p=firefly-linux-kernel-4.4.55.git

consoleearlysuspend: Fix for 2.6.32

vt_waitactive now needs a 1 based console number

Change-Id: I07ab9a3773c93d67c09d928c8d5494ce823ffa2e
---

diff --git a/kernel/power/consoleearlysuspend.c b/kernel/power/consoleearlysuspend.c
index a8befb419158..a3edcb267389 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");
 }