Commit 9a4768d8 authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-runtime' into linux-next 

* pm-runtime:
  PM / Runtime: don't forget to wake up waitqueue on failure
parents 735e941c f2791d73

drivers/base/power/runtime.c

+2 −1
Original line number Diff line number Diff line
@@ -532,6 +532,8 @@ static int rpm_suspend(struct device *dev, int rpmflags) 
	dev->power.suspend_time = ktime_set(0, 0);

	dev->power.max_time_suspended_ns = -1;

	dev->power.deferred_resume = false;

	wake_up_all(&dev->power.wait_queue);



	if (retval == -EAGAIN || retval == -EBUSY) {

		dev->power.runtime_error = 0;
@@ -547,7 +549,6 @@ static int rpm_suspend(struct device *dev, int rpmflags) 
	} else {

		pm_runtime_cancel_pending(dev);

	}

	wake_up_all(&dev->power.wait_queue);

	goto out;

}