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

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

Revision: 615
          http://svn.sourceforge.net/hackndev/?rev=615&view=rev
Author:   bobofdoom
Date:     2006-10-01 18:42:21 -0700 (Sun, 01 Oct 2006)

Log Message:
-----------
palmld: Don't wait to switch VT's on suspend, it hangs OPIE.

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-01 10:38:47 UTC (rev 614)
+++ linux4palm/linux/trunk/kernel/power/console.c	2006-10-02 01:42:21 UTC (rev 615)
@@ -30,10 +30,17 @@
 	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;
 	return 0;


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