Commit 071f5827 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-runtime' 

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

drivers/base/power/runtime.c

+3 −0
Original line number Diff line number Diff line
@@ -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)