From 8ab4eb47f00b20b0aba0d495f37314ed2c174315 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Sat, 9 Aug 2008 01:05:13 +0200
Subject: [PATCH] --- yaml --- r: 108991 b: refs/heads/master c:
 f5a6d958b5d0a10e7e7a9dee1862fb31d08c6d26 h: refs/heads/master i:   108989:
 7a4773c1cc4dec39ec2fd907a6fc592b1a19cc2a   108987:
 09c532df39d0b5f0305aa73af40414ac60d28563   108983:
 eacb86f026d54053ff86954d1a4b3d9fb2d4e8ca   108975:
 c29b5cf30201f9c7c25fa7df27db8f46207baf41   108959:
 089b1a9e1cce37cf16fccf98820c9d05753e161e   108927:
 4cb99ed7227ea5f8087fdd01c4660f71022df4a4 v: v3

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

diff --git a/[refs] b/[refs]
index fa41b987183d..be57afa989ae 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c906a48adc74fc455378137ac5124b13e7030a15
+refs/heads/master: f5a6d958b5d0a10e7e7a9dee1862fb31d08c6d26
diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c
index 284f564bb12b..273a944d4040 100644
--- a/trunk/drivers/base/power/main.c
+++ b/trunk/drivers/base/power/main.c
@@ -74,11 +74,9 @@ void device_pm_add(struct device *dev)
 		 kobject_name(&dev->kobj));
 	mutex_lock(&dpm_list_mtx);
 	if (dev->parent) {
-		if (dev->parent->power.status >= DPM_SUSPENDING) {
-			dev_warn(dev, "parent %s is sleeping, will not add\n",
+		if (dev->parent->power.status >= DPM_SUSPENDING)
+			dev_warn(dev, "parent %s should not be sleeping\n",
 				dev->parent->bus_id);
-			WARN_ON(true);
-		}
 	} else if (transition_started) {
 		/*
 		 * We refuse to register parentless devices while a PM