From 8f017351acdab5c042defe4df90b9e9cfdaf8f8d Mon Sep 17 00:00:00 2001 From: "Rafael J. Wysocki" Date: Thu, 3 Dec 2009 21:04:41 +0100 Subject: [PATCH] --- yaml --- r: 172352 b: refs/heads/master c: 965c4ac0613b071d6f035334c5d9d942013df4f9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/base/power/runtime.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 32e19e3fd83c..3da8a74ccf0d 100644 --- 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 index 637706951885..5a01ecef4af3 100644 --- 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);