---

yaml --- r: 305831 b: refs/heads/master c: 52d136c h: refs/heads/master i: 305829: 51eded5 305827: 2c15a1d 305823: c686062 v: v3
git-mirror · May 1, 2012 · 688645d · 688645d
1 parent 2d93d1c
commit 688645d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5a21d489fd9541a4a66b9a500659abaca1b19a51
+refs/heads/master: 52d136cc2cf6659ee247dbcc88c9e7bd7428ad06
diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c
@@ -889,6 +889,11 @@ static int dpm_suspend_noirq(pm_message_t state)
 		if (!list_empty(&dev->power.entry))
 			list_move(&dev->power.entry, &dpm_noirq_list);
 		put_device(dev);
+
+		if (pm_wakeup_pending()) {
+			error = -EBUSY;
+			break;
+		}
 	}
 	mutex_unlock(&dpm_list_mtx);
 	if (error)
@@ -962,6 +967,11 @@ static int dpm_suspend_late(pm_message_t state)
 		if (!list_empty(&dev->power.entry))
 			list_move(&dev->power.entry, &dpm_late_early_list);
 		put_device(dev);
+
+		if (pm_wakeup_pending()) {
+			error = -EBUSY;
+			break;
+		}
 	}
 	mutex_unlock(&dpm_list_mtx);
 	if (error)