---

yaml --- r: 172352 b: refs/heads/master c: 965c4ac h: refs/heads/master v: v3
git-mirror · Dec 6, 2009 · 8f01735 · 8f01735
1 parent dbb3230
commit 8f01735
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e1b1903eee71c5fa6063bbf713cfc947e76c4e04
+refs/heads/master: 965c4ac0613b071d6f035334c5d9d942013df4f9
diff --git a/trunk/drivers/base/power/runtime.c b/trunk/drivers/base/power/runtime.c
@@ -791,12 +791,10 @@ int __pm_runtime_set_status(struct device *dev, unsigned int status)
 		 */
 		if (!parent->power.disable_depth
 		    && !parent->power.ignore_children
-		    && parent->power.runtime_status != RPM_ACTIVE) {
+		    && parent->power.runtime_status != RPM_ACTIVE)
 			error = -EBUSY;
-		} else {
-			if (dev->power.runtime_status == RPM_SUSPENDED)
-				atomic_inc(&parent->power.child_count);
-		}
+		else if (dev->power.runtime_status == RPM_SUSPENDED)
+			atomic_inc(&parent->power.child_count);
 
 		spin_unlock(&parent->power.lock);