linux-pm.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: shuox.liu@intel.com
To: linux-kernel@vger.kernel.org
Cc: len.brown@intel.com, pavel@ucw.cz, rjw@sisk.pl,
	yanmin_zhang@linux.intel.com, linux-pm@vger.kernel.org
Subject: [PATCH] PM: avoid 'autosleep' in shutdown progress
Date: Thu, 11 Jul 2013 16:03:45 +0800	[thread overview]
Message-ID: <1373529825-20741-1-git-send-email-shuox.liu@intel.com> (raw)

From: Liu ShuoX <shuox.liu@intel.com>

In shutdown progress, system is possible to do power transition
(such as suspend-to-ram) in parallel. It is unreasonable. So,
fixes it by adding a system_state checking and queue try_to_suspend
again when system status is not running.

Signed-off-by: Liu ShuoX <shuox.liu@intel.com>
---
 kernel/power/autosleep.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/kernel/power/autosleep.c b/kernel/power/autosleep.c
index c6422ff..9012ecf 100644
--- a/kernel/power/autosleep.c
+++ b/kernel/power/autosleep.c
@@ -32,7 +32,8 @@ static void try_to_suspend(struct work_struct *work)
 
 	mutex_lock(&autosleep_lock);
 
-	if (!pm_save_wakeup_count(initial_count)) {
+	if (!pm_save_wakeup_count(initial_count) ||
+		system_state != SYSTEM_RUNNING) {
 		mutex_unlock(&autosleep_lock);
 		goto out;
 	}
-- 
1.7.1


             reply	other threads:[~2013-07-11  8:04 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-07-11  8:03 shuox.liu [this message]
2013-07-12  6:14 ` [PATCH] PM: avoid 'autosleep' in shutdown progress Yanmin Zhang
2013-07-12 14:37   ` Alan Stern
2013-07-13 11:56     ` Pavel Machek
2013-07-15  0:51       ` Yanmin Zhang
2013-07-15  0:16   ` Rafael J. Wysocki

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=1373529825-20741-1-git-send-email-shuox.liu@intel.com \
    --to=shuox.liu@intel.com \
    --cc=len.brown@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=pavel@ucw.cz \
    --cc=rjw@sisk.pl \
    --cc=yanmin_zhang@linux.intel.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;
as well as URLs for NNTP newsgroup(s).