---

yaml --- r: 321797 b: refs/heads/master c: 58a34de h: refs/heads/master i: 321795: e2b27c3 v: v3
git-mirror · Aug 17, 2012 · 90bd2e9 · 90bd2e9
1 parent 77ea205
commit 90bd2e9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7f321c26c04807834fef4c524d2b21573423fc74
+refs/heads/master: 58a34de7b1a920d287d17d2ca08bc9aaf7e6d35b
diff --git a/trunk/drivers/base/power/runtime.c b/trunk/drivers/base/power/runtime.c
@@ -388,7 +388,6 @@ static int rpm_suspend(struct device *dev, int rpmflags)
 		goto repeat;
 	}
 
-	dev->power.deferred_resume = false;
 	if (dev->power.no_callbacks)
 		goto no_callback;	/* Assume success. */
 
@@ -440,6 +439,7 @@ static int rpm_suspend(struct device *dev, int rpmflags)
 	wake_up_all(&dev->power.wait_queue);
 
 	if (dev->power.deferred_resume) {
+		dev->power.deferred_resume = false;
 		rpm_resume(dev, 0);
 		retval = -EAGAIN;
 		goto out;