From 75b142096816d14a61d570a964a9b235cf2ade42 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Date: Wed, 24 Oct 2012 02:08:30 +0200
Subject: [PATCH] --- yaml --- r: 336591 b: refs/heads/master c:
 34b1f76275a2cb8c1ce8e00095d200552b235122 h: refs/heads/master i:   336589:
 8ac0c4b4102fb7b6cdc501b83900f4bac0c6af0b   336587:
 e295441371a4da96d1496f0bce6a3cd88dd8ff70   336583:
 b93ff79a020f07bf33bdc0b8d060af349a2c23fb   336575:
 ad27bcb34983c1e4d16695484d84b61c1a15f45b v: v3

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

diff --git a/[refs] b/[refs]
index b65c525a1625..fad3164a74fa 100644
--- 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
index c22b869245d9..e2cf392d99d2 100644
--- 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;