From: 黄涛 <huangtao@rock-chips.com>
Date: Sat, 30 Jul 2011 14:58:04 +0000 (+0800)
Subject: Revert "consoleearlysuspend: Fix for 2.6.32"
X-Git-Tag: firefly_0821_release~9867
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=e5708336afe691edb5c74e3c12c3f69a7a6b6831;p=firefly-linux-kernel-4.4.55.git

Revert "consoleearlysuspend: Fix for 2.6.32"

This reverts commit 7fc8c1c2813bd2c08e9a2fe1958451a33f30df14.
---

diff --git a/kernel/power/consoleearlysuspend.c b/kernel/power/consoleearlysuspend.c
index a3edcb267389..a8befb419158 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 + 1))
+	if (vt_waitactive(EARLY_SUSPEND_CONSOLE))
 		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 + 1))
+	if (vt_waitactive(orig_fgconsole))
 		pr_warning("console_late_resume: Can't switch VCs.\n");
 }