diff options
| author | Colin Cross <ccross@android.com> | 2011-06-29 13:43:12 -0700 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@nvidia.com> | 2011-11-30 21:38:44 -0800 |
| commit | f9b7a5f58ac563fc8d6a90aade0be0f473acb513 (patch) | |
| tree | 37fed853580ca21e3fc2d048097bf77b572b5904 /drivers/base/power | |
| parent | c276108fd17c700a067e01c58063e7ad4c41dcef (diff) | |
Revert "PM: Prevent waiting forever on asynchronous resume after abort"
This reverts commit fa92a3d6959546baa27e892188d3e9bb79c31741.
Diffstat (limited to 'drivers/base/power')
| -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 13518a1067d5..7b4b78a6e82e 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -517,8 +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.status >= DPM_OFF) - dpm_wait(dev->parent, async); + dpm_wait(dev->parent, async); device_lock(dev); /* |