Commit b090f9fa authored Feb 14, 2009 by Arve Hjønnevåg Committed by Linus Torvalds Feb 21, 2009

PM: Wait for console in resume

Avoids later waking up to a blinking cursor if the device woke up and
returned to sleep before the console switch happened.

Signed-off-by: Brian Swetland <swetland@google.com>
Signed-off-by: Arve Hjønnevåg <arve@android.com>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Cc: Len Brown <lenb@kernel.org>
Cc: Greg KH <gregkh@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent ebae2604

kernel/power/console.c

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -78,6 +78,12 @@ void pm_restore_console(void)
	}		}
	set_console(orig_fgconsole);		set_console(orig_fgconsole);
	release_console_sem();		release_console_sem();

			if (vt_waitactive(orig_fgconsole)) {
			pr_debug("Resume: Can't switch VCs.");
			return;
			}

	kmsg_redirect = orig_kmsg;		kmsg_redirect = orig_kmsg;
	}		}
	#endif		#endif