diff options
| author | Colin Cross <ccross@android.com> | 2011-06-29 13:42:56 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:44 -0800 |
| commit | c276108fd17c700a067e01c58063e7ad4c41dcef (patch) | |
| tree | 29ce7b1e077fd4158cd3667d050902e79e168382 | |
| parent | 3768ceb3dd66f929547328f4225d7805d95a88cd (diff) | |
Revert "PM: Wait for completion of the parent resume before resuming"
This reverts commit a0f07aae54e87a9fad6d19c0e57398f54d858f06.
| -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 6f4e855c5533..13518a1067d5 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -517,7 +517,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); |