---

yaml --- r: 336591 b: refs/heads/master c: 34b1f76 h: refs/heads/master i: 336589: 8ac0c4b 336587: e295441 336583: b93ff79 336575: ad27bcb v: v3
git-mirror · Oct 24, 2012 · 75b1420 · 75b1420
1 parent 2c1ae3c
commit 75b1420
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e39473d0b9448e770f49b0b15e514be884264438
+refs/heads/master: 34b1f76275a2cb8c1ce8e00095d200552b235122
diff --git a/trunk/drivers/base/power/domain.c b/trunk/drivers/base/power/domain.c
@@ -470,10 +470,19 @@ static int pm_genpd_poweroff(struct generic_pm_domain *genpd)
 		return -EBUSY;
 
 	not_suspended = 0;
-	list_for_each_entry(pdd, &genpd->dev_list, list_node)
+	list_for_each_entry(pdd, &genpd->dev_list, list_node) {
+		enum pm_qos_flags_status stat;
+
+		stat = dev_pm_qos_flags(pdd->dev,
+					PM_QOS_FLAG_NO_POWER_OFF
+						| PM_QOS_FLAG_REMOTE_WAKEUP);
+		if (stat > PM_QOS_FLAGS_NONE)
+			return -EBUSY;
+
 		if (pdd->dev->driver && (!pm_runtime_suspended(pdd->dev)
 		    || pdd->dev->power.irq_safe))
 			not_suspended++;
+	}
 
 	if (not_suspended > genpd->in_progress)
 		return -EBUSY;