Merge branch 'pm-runtime'

* pm-runtime: PM / Runtime: let rpm_resume() succeed if RPM_ACTIVE, even when disabled, v2
git-mirror · Sep 24, 2012 · 071f582 · 071f582
2 parents c26d411 + 6f3c77b
commit 071f582
Showing 1 changed file with 3 additions and 0 deletions.
diff --git 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)