X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=drivers%2Fbase%2Fpower%2Fruntime.c;h=3148b10dc2e59b92dd5913e2b34c446d54ac69b7;hb=a5a0fc67435599d9d787a8d7153967a70fed968e;hp=7d9c1cb1c39a7760081bae4d518efd8acf835902;hpb=e6ca4ae895e9fbf8b96d3ee1dd44ea96e95babad;p=~andy%2Flinux

diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 7d9c1cb1c39..3148b10dc2e 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)