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

Commit 91ab9bf7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6 

* 'pm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/suspend-2.6:
  PM / Runtime: Fix typo in status comparison causing warning
parents b7bdcc47 78ca7c37

drivers/base/power/runtime.c

+1 −1
Original line number Diff line number Diff line
@@ -143,7 +143,7 @@ static int rpm_check_suspend_allowed(struct device *dev) 


	/* Pending resume requests take precedence over suspends. */

	else if ((dev->power.deferred_resume

			&& dev->power.status == RPM_SUSPENDING)

			&& dev->power.runtime_status == RPM_SUSPENDING)

	    || (dev->power.request_pending

			&& dev->power.request == RPM_REQ_RESUME))

		retval = -EAGAIN;