diff options
| author | Colin Cross <ccross@android.com> | 2011-06-29 13:42:56 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2011-06-29 13:42:56 -0700 |
| commit | a88985f2b5cc71e524aec001b81f878bed5d29fb (patch) | |
| tree | de372676647caf0f89689e1d4f61be27ecdd6810 /drivers/base | |
| parent | c797ca58ffc136a7f64761d8c6b85cdbab3cfed8 (diff) | |
| download | kernel_samsung_crespo-a88985f2b5cc71e524aec001b81f878bed5d29fb.zip kernel_samsung_crespo-a88985f2b5cc71e524aec001b81f878bed5d29fb.tar.gz kernel_samsung_crespo-a88985f2b5cc71e524aec001b81f878bed5d29fb.tar.bz2 | |
Revert "PM: Wait for completion of the parent resume before resuming"
This reverts commit a0f07aae54e87a9fad6d19c0e57398f54d858f06.
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 5720943..8984e13 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -515,7 +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.in_suspend) + if (dev->parent && dev->parent->power.status >= DPM_OFF) dpm_wait(dev->parent, async); device_lock(dev); |