diff options
| author | Colin Cross <ccross@android.com> | 2011-06-29 13:43:12 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-29 13:43:12 -0700 |
| commit | e32c14667e4fe9f16ac9b918d15d29abd2315a55 (patch) | |
| tree | 10caca50ec1cd2a62645122059a9f0fd14e35368 /drivers/base | |
| parent | a88985f2b5cc71e524aec001b81f878bed5d29fb (diff) | |
| download | kernel_samsung_espresso10-e32c14667e4fe9f16ac9b918d15d29abd2315a55.zip kernel_samsung_espresso10-e32c14667e4fe9f16ac9b918d15d29abd2315a55.tar.gz kernel_samsung_espresso10-e32c14667e4fe9f16ac9b918d15d29abd2315a55.tar.bz2 | |
Revert "PM: Prevent waiting forever on asynchronous resume after abort"
This reverts commit fa92a3d6959546baa27e892188d3e9bb79c31741.
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 8984e13..06e4391 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -515,8 +515,7 @@ static int device_resume(struct device *dev, pm_message_t state, bool async) TRACE_DEVICE(dev); TRACE_RESUME(0); - if (dev->parent && dev->parent->power.status >= DPM_OFF) - dpm_wait(dev->parent, async); + dpm_wait(dev->parent, async); device_lock(dev); dev->power.in_suspend = false; |