From 8707bac6a23f780339f648d7b2605132e7f7ec5f Mon Sep 17 00:00:00 2001
From: Xiaotian Feng <dfeng@redhat.com>
Date: Thu, 20 Aug 2009 20:28:33 +0200
Subject: [PATCH] --- yaml --- r: 161354 b: refs/heads/master c:
 3eb132c986f04f64b9c360abd67a1e0d18d6d5b4 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/drivers/base/power/main.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 9450d0367303..a4731f297292 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 20d652d7d1c2f202215ecf0306ccecc3569df9ba
+refs/heads/master: 3eb132c986f04f64b9c360abd67a1e0d18d6d5b4
diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c
index b0899118569b..e0dc4071e088 100644
--- a/trunk/drivers/base/power/main.c
+++ b/trunk/drivers/base/power/main.c
@@ -365,6 +365,7 @@ void dpm_resume_noirq(pm_message_t state)
 	struct device *dev;
 
 	mutex_lock(&dpm_list_mtx);
+	transition_started = false;
 	list_for_each_entry(dev, &dpm_list, power.entry)
 		if (dev->power.status > DPM_OFF) {
 			int error;
@@ -443,7 +444,6 @@ static void dpm_resume(pm_message_t state)
 
 	INIT_LIST_HEAD(&list);
 	mutex_lock(&dpm_list_mtx);
-	transition_started = false;
 	while (!list_empty(&dpm_list)) {
 		struct device *dev = to_device(dpm_list.next);