diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 18:09:56 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-29 18:09:56 -0400 |
| commit | 91ab9bf7c5322128d3b29c04393268658631e26a (patch) | |
| tree | 7a9b91ba1040fb2d070f0d77a0922532fdfa23a8 /drivers/base | |
| parent | b7bdcc47114595b4b359fe0f7d941bb901e9261d (diff) | |
| parent | 78ca7c37efaa541006269aa3d3e560ea7926e245 (diff) | |
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/base')
| -rw-r--r-- | drivers/base/power/runtime.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/runtime.c b/drivers/base/power/runtime.c index 126ca492dd08..02c652be83e7 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) | |||
| 143 | 143 | ||
| 144 | /* Pending resume requests take precedence over suspends. */ | 144 | /* Pending resume requests take precedence over suspends. */ |
| 145 | else if ((dev->power.deferred_resume | 145 | else if ((dev->power.deferred_resume |
| 146 | && dev->power.status == RPM_SUSPENDING) | 146 | && dev->power.runtime_status == RPM_SUSPENDING) |
| 147 | || (dev->power.request_pending | 147 | || (dev->power.request_pending |
| 148 | && dev->power.request == RPM_REQ_RESUME)) | 148 | && dev->power.request == RPM_REQ_RESUME)) |
| 149 | retval = -EAGAIN; | 149 | retval = -EAGAIN; |