Merge branch 'pm-runtime'

* pm-runtime:
  PM / Runtime: let rpm_resume() succeed if RPM_ACTIVE, even when disabled, v2

1 files changed, 3 insertions, 0 deletions

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 7d9c1cb1c39a..3148b10dc2e5 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -509,6 +509,9 @@ static int rpm_resume(struct device *dev, int rpmflags)
  repeat:
         if (dev->power.runtime_error)
                 retval = -EINVAL;
+        else if (dev->power.disable_depth == 1 && dev->power.is_suspended
+            && dev->power.runtime_status == RPM_ACTIVE)
+                retval = 1;
         else if (dev->power.disable_depth > 0)
                 retval = -EACCES;
         if (retval)