aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 15:09:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-10-29 15:09:56 -0700
commit91ab9bf7c5322128d3b29c04393268658631e26a (patch)
tree7a9b91ba1040fb2d070f0d77a0922532fdfa23a8 /drivers
parentb7bdcc47114595b4b359fe0f7d941bb901e9261d (diff)
parent78ca7c37efaa541006269aa3d3e560ea7926e245 (diff)
downloadlinux-2.6.38-lt-ux500-91ab9bf7c5322128d3b29c04393268658631e26a.tar.gz
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
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/power/runtime.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c
index 126ca492dd0..02c652be83e 100644
--- a/drivers/base/power/runtime.c
+++ b/drivers/base/power/runtime.c
@@ -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;