PM / Runtime: Fix rpm_resume() return value for power.no_callbacks set

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 <rjw@sisk.pl>
Acked-by: Alan Stern <stern@rowland.harvard.edu>
Cc: stable@vger.kernel.org

1 files changed, 2 insertions, 1 deletions

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 59894873a3b3..9891a8559203 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -584,6 +584,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);
@@ -664,7 +665,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: