public inbox for linux-pm@vger.kernel.org
 help / color / mirror / Atom feed
From: "Arve Hjønnevåg" <arve@android.com>
To: linux-pm@lists.linux-foundation.org
Cc: swetland@google.com
Subject: [PATCH 1/2] PM: Wait for console in resume.
Date: Tue, 13 Jan 2009 17:07:50 -0800	[thread overview]
Message-ID: <1231895271-21861-2-git-send-email-arve@android.com> (raw)
In-Reply-To: <1231895271-21861-1-git-send-email-arve@android.com>

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>
---
 kernel/power/console.c |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/kernel/power/console.c b/kernel/power/console.c
index b8628be..a3961b2 100644
--- a/kernel/power/console.c
+++ b/kernel/power/console.c
@@ -78,6 +78,12 @@ void pm_restore_console(void)
 	}
 	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
-- 
1.6.1

_______________________________________________
linux-pm mailing list
linux-pm@lists.linux-foundation.org
https://lists.linux-foundation.org/mailman/listinfo/linux-pm

  reply	other threads:[~2009-01-14  1:07 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2009-01-14  1:07 [PATCH 0/2] Android PM fixes Arve Hjønnevåg
2009-01-14  1:07 ` Arve Hjønnevåg [this message]
2009-01-14  1:07   ` [PATCH 2/2] PM: Fix suspend_console/resume_console to use only one semaphore Arve Hjønnevåg
2009-01-28 19:30     ` Pavel Machek
2009-01-31  3:27       ` [PATCH 1/2] PM: Wait for console in resume Arve Hjønnevåg
     [not found]       ` <1233372459-6434-1-git-send-email-arve@android.com>
2009-01-31  3:27         ` [PATCH 2/2] PM: Fix suspend_console/resume_console to use only one semaphore Arve Hjønnevåg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1231895271-21861-2-git-send-email-arve@android.com \
    --to=arve@android.com \
    --cc=linux-pm@lists.linux-foundation.org \
    --cc=swetland@google.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox