diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-05-02 10:41:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-05-02 10:41:40 +0200 |
| commit | a3ea8e8f2474c35b4c3e22262991afddb93c4c0e (patch) | |
| tree | 648bbeea304950d02e71863673be8154a5e491f6 /drivers/base/power/runtime.c | |
| parent | c2de187e5b0f25b572ac1cb6cdf383f16123717d (diff) | |
| parent | ebb47241ea0eac6a5a23404821a2d62f64c68496 (diff) | |
| download | op-kernel-dev-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.zip op-kernel-dev-a3ea8e8f2474c35b4c3e22262991afddb93c4c0e.tar.gz | |
Merge branch 'fix/hda' into topic/hda
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 54597c8..3172c60d 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) * * Check if the device's run-time PM status allows it to be resumed. Cancel * any scheduled or pending requests. If another resume has been started - * earlier, either return imediately or wait for it to finish, depending on the + * earlier, either return immediately or wait for it to finish, depending on the * RPM_NOWAIT and RPM_ASYNC flags. Similarly, if there's a suspend running in * parallel with this function, either tell the other process to resume after * suspending (deferred_resume) or wait for it to finish. If the RPM_ASYNC |
