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 <[e-mail]>
Signed-off-by: Arve Hjønnevåg <[e-mail]>
Signed-off-by: Rafael J. Wysocki <[e-mail]>
Cc: Len Brown <[e-mail]>
Cc: Greg KH <[e-mail]>
Signed-off-by: Linus Torvalds <[e-mail]>

kernel/power/console.c

···
 	}
 	set_console(orig_fgconsole);
 	release_console_sem();
+
+	if (vt_waitactive(orig_fgconsole)) {
+		pr_debug("Resume: Can't switch VCs.");
+		return;
+	}
+
 	kmsg_redirect = orig_kmsg;
 }
 #endif