From a1a0c9f24f914dba961c63fb2aea263ee4b82160 Mon Sep 17 00:00:00 2001
From: "Rafael J. Wysocki" <rjw@sisk.pl>
Date: Wed, 23 Apr 2008 00:48:23 +0200
Subject: [PATCH] --- yaml --- r: 91911 b: refs/heads/master c:
 08119e8966e993993d0ba92b2fba38c582c8f787 h: refs/heads/master i:   91909:
 b7e9618aef6c4afeda0cfa633e5c42a4d8830ae6   91907:
 4624a8dea6b0c1225e769611627ce1c31a1493e2   91903:
 b08a5a544a8df79600644ebacf09a37c04715bb0 v: v3

---
 [refs]                          |  2 +-
 trunk/drivers/base/power/main.c | 15 ++++++---------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index d97d0eca425f..02d755e09285 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aca239b793a4006db0d92ad0e43846ab6b54d816
+refs/heads/master: 08119e8966e993993d0ba92b2fba38c582c8f787
diff --git a/trunk/drivers/base/power/main.c b/trunk/drivers/base/power/main.c
index c4568b82875b..7b76fd3b93a4 100644
--- a/trunk/drivers/base/power/main.c
+++ b/trunk/drivers/base/power/main.c
@@ -62,7 +62,7 @@ static bool all_sleeping;
  */
 int device_pm_add(struct device *dev)
 {
-	int error = 0;
+	int error;
 
 	pr_debug("PM: Adding info for %s:%s\n",
 		 dev->bus ? dev->bus->name : "No Bus",
@@ -70,18 +70,15 @@ int device_pm_add(struct device *dev)
 	mutex_lock(&dpm_list_mtx);
 	if ((dev->parent && dev->parent->power.sleeping) || all_sleeping) {
 		if (dev->parent->power.sleeping)
-			dev_warn(dev,
-				"parent %s is sleeping, will not add\n",
+			dev_warn(dev, "parent %s is sleeping\n",
 				dev->parent->bus_id);
 		else
-			dev_warn(dev, "devices are sleeping, will not add\n");
+			dev_warn(dev, "all devices are sleeping\n");
 		WARN_ON(true);
-		error = -EBUSY;
-	} else {
-		error = dpm_sysfs_add(dev);
-		if (!error)
-			list_add_tail(&dev->power.entry, &dpm_active);
 	}
+	error = dpm_sysfs_add(dev);
+	if (!error)
+		list_add_tail(&dev->power.entry, &dpm_active);
 	mutex_unlock(&dpm_list_mtx);
 	return error;
 }