diff options
author | Arve Hjønnevåg <arve@android.com> | 2009-12-14 22:14:52 -0800 |
---|---|---|
committer | Iliyan Malchev <malchev@google.com> | 2011-05-23 15:41:57 -0700 |
commit | 4657746ba7d85a6b486f562fba4777552a328b2f (patch) | |
tree | 749fca3f36fe21f0a235b3bd146ed06fe10a6b1b /kernel | |
parent | 886cb243715375d430abd0484d2de3d7d5713970 (diff) |
consoleearlysuspend: Fix for 2.6.32
vt_waitactive now needs a 1 based console number
Change-Id: I07ab9a3773c93d67c09d928c8d5494ce823ffa2e
Diffstat (limited to 'kernel')
-rw-r--r-- | 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 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"); } |