Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755844Ab3GKIEd (ORCPT ); Thu, 11 Jul 2013 04:04:33 -0400 Received: from mga01.intel.com ([192.55.52.88]:56966 "EHLO mga01.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755611Ab3GKIEU (ORCPT ); Thu, 11 Jul 2013 04:04:20 -0400 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.87,1042,1363158000"; d="scan'208";a="363587133" 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 Message-Id: <1373529825-20741-1-git-send-email-shuox.liu@intel.com> X-Mailer: git-send-email 1.7.1 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1113 Lines: 34 From: Liu ShuoX 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 --- 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/