diff options
| author | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2011-04-19 07:32:41 -0400 |
| commit | d4ab4e6a23f805abb8fc3cc34525eec3788aeca1 (patch) | |
| tree | eefd82c155bc27469a85667d759cd90facf4a6e3 /drivers/base/power/runtime.c | |
| parent | c0fa797ae6cd02ff87c0bfe0d509368a3b45640e (diff) | |
| parent | 96fd2d57b8252e16dfacf8941f7a74a6119197f5 (diff) | |
Merge branch 'master'; commit 'v2.6.39-rc3' into next
Diffstat (limited to 'drivers/base/power/runtime.c')
| -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 54597c859ecb..3172c60d23a9 100644 --- a/drivers/base/power/runtime.c +++ b/drivers/base/power/runtime.c | |||
| @@ -443,7 +443,7 @@ static int rpm_suspend(struct device *dev, int rpmflags) | |||
| 443 | * | 443 | * |
| 444 | * Check if the device's run-time PM status allows it to be resumed. Cancel | 444 | * Check if the device's run-time PM status allows it to be resumed. Cancel |
| 445 | * any scheduled or pending requests. If another resume has been started | 445 | * any scheduled or pending requests. If another resume has been started |
| 446 | * earlier, either return imediately or wait for it to finish, depending on the | 446 | * earlier, either return immediately or wait for it to finish, depending on the |
| 447 | * RPM_NOWAIT and RPM_ASYNC flags. Similarly, if there's a suspend running in | 447 | * RPM_NOWAIT and RPM_ASYNC flags. Similarly, if there's a suspend running in |
| 448 | * parallel with this function, either tell the other process to resume after | 448 | * parallel with this function, either tell the other process to resume after |
| 449 | * suspending (deferred_resume) or wait for it to finish. If the RPM_ASYNC | 449 | * suspending (deferred_resume) or wait for it to finish. If the RPM_ASYNC |