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
This commit is contained in:
commit
91ab9bf7c5
|
@ -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;
|
||||
|
|
Loading…
Reference in New Issue
Block a user