Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5aebc7d2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Merge tag 'pm-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Rafael writes:
  "Power management fix for 4.19-rc7

   Fix a bug that may cause runtime PM to misbehave for some devices
   after a failing or aborted system suspend which is nasty enough for
   an -rc7 time frame fix."

* tag 'pm-4.19-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  PM / core: Clear the direct_complete flag on errors
parents 31d09908 69e445ab

drivers/base/power/main.c

+4 −1
Original line number Diff line number Diff line
@@ -1713,8 +1713,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) 


	dpm_wait_for_subordinate(dev, async);



	if (async_error)

	if (async_error) {

		dev->power.direct_complete = false;

		goto Complete;

	}



	/*

	 * If a device configured to wake up the system from sleep states
@@ -1726,6 +1728,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) 
		pm_wakeup_event(dev, 0);



	if (pm_wakeup_pending()) {

		dev->power.direct_complete = false;

		async_error = -EBUSY;

		goto Complete;

	}