consoleearlysuspend: Fix for 2.6.32
Arve Hjønnevåg [Tue, 15 Dec 2009 06:14:52 +0000 (22:14 -0800)]
vt_waitactive now needs a 1 based console number

Change-Id: I07ab9a3773c93d67c09d928c8d5494ce823ffa2e

kernel/power/consoleearlysuspend.c

index a8befb4..a3edcb2 100644 (file)
@@ -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");
 }