From: Rafael J. Wysocki Date: Wed, 15 Aug 2012 19:31:45 +0000 (+0200) Subject: PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set X-Git-Tag: v3.4.12~78 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a0bfb9191135a16c84df7ba580ea839aefff4a0f;p=karo-tx-linux.git PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set commit 7f321c26c04807834fef4c524d2b21573423fc74 upstream. For devices whose power.no_callbacks flag is set, rpm_resume() should return 1 if the device's parent is already active, so that the callers of pm_runtime_get() don't think that they have to wait for the device to resume (asynchronously) in that case (the core won't queue up an asynchronous resume in that case, so there's nothing to wait for anyway). Modify the code accordingly (and make sure that an idle notification will be queued up on success, even if 1 is to be returned). Signed-off-by: Rafael J. Wysocki Acked-by: Alan Stern Signed-off-by: Greg Kroah-Hartman --- diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index bd0f3949bcf9..7f4567c45fa5 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c @@ -652,6 +652,7 @@ static int rpm_resume(struct device *dev, int rpmflags) || dev->parent->power.runtime_status == RPM_ACTIVE) { atomic_inc(&dev->parent->power.child_count); spin_unlock(&dev->parent->power.lock); + retval = 1; goto no_callback; /* Assume success. */ } spin_unlock(&dev->parent->power.lock); @@ -735,7 +736,7 @@ static int rpm_resume(struct device *dev, int rpmflags) } wake_up_all(&dev->power.wait_queue); - if (!retval) + if (retval >= 0) rpm_idle(dev, RPM_ASYNC); out: