summaryrefslogtreecommitdiff
path: root/kernel/power
diff options
context:
space:
mode:
authorArve Hjønnevåg <arve@android.com>2009-12-14 22:14:52 -0800
committerColin Cross <ccross@android.com>2010-09-29 17:49:08 -0700
commite1310abde57e42211413608d060242a7c50f30ec (patch)
tree3a2bf2c6134587a5c28ee244ea9051e93307a98a /kernel/power
parent8dcec0d65d01fc619b06d8bd5416619a26b75985 (diff)
consoleearlysuspend: Fix for 2.6.32
vt_waitactive now needs a 1 based console number Change-Id: I07ab9a3773c93d67c09d928c8d5494ce823ffa2e
Diffstat (limited to 'kernel/power')
-rw-r--r--kernel/power/consoleearlysuspend.c4
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");
}