[Hackndev-commit] SF.net SVN: hackndev: [647] linux4palm/linux/trunk/kernel/power/console.c

[<bob...@us...>]

Revision: 647
          http://svn.sourceforge.net/hackndev/?rev=647&view=rev
Author:   bobofdoom
Date:     2006-10-29 03:35:31 -0800 (Sun, 29 Oct 2006)

Log Message:
-----------
palmld: Don't even try to change VTs on suspend.

Modified Paths:
--------------
    linux4palm/linux/trunk/kernel/power/console.c

Modified: linux4palm/linux/trunk/kernel/power/console.c
===================================================================
--- linux4palm/linux/trunk/kernel/power/console.c	2006-10-28 11:32:19 UTC (rev 646)
+++ linux4palm/linux/trunk/kernel/power/console.c	2006-10-29 11:35:31 UTC (rev 647)
@@ -16,6 +16,13 @@
 
 int pm_prepare_console(void)
 {
+	/* <Alex>
+	 * OPIE locks the console so we can't switch vts, this means we hang when 
+	 * trying to suspend. I'm not sure how we're supposed to get around it,
+	 * other than this. The suspend console is ugly, anyhow. ;-)
+	 */
+#ifndef CONFIG_MACH_XSCALE_PALMLD
+
 	acquire_console_sem();
 
 	orig_fgconsole = fg_console;
@@ -30,19 +37,13 @@
 	set_console(SUSPEND_CONSOLE);
 	release_console_sem();
 
-	/* <Alex>
-	 * OPIE locks the console so we can't switch vts, this means we hang when 
-	 * trying to suspend. I'm not sure how we're supposed to get around it,
-	 * other than this. The suspend console is ugly, anyhow. ;-)
-	 */
-#ifndef CONFIG_MACH_XSCALE_PALMLD
 	if (vt_waitactive(SUSPEND_CONSOLE)) {
 		pr_debug("Suspend: Can't switch VCs.");
 		return 1;
 	}
-#endif
 	orig_kmsg = kmsg_redirect;
 	kmsg_redirect = SUSPEND_CONSOLE;
+#endif
 	return 0;
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.