diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-11-28 12:00:55 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-11-28 12:00:55 +0800 |
| commit | edf995d84e268ded42276ae0967a4b2c8541f08b (patch) | |
| tree | c0b0f2dc6e9efd6bb9dcf56cf2226a0d0114865d /drivers/base | |
| parent | 5497d2d7d543b4b8854700d47a175e157fecbfd1 (diff) | |
| parent | 0a5b451a53d4d181f22ab309403646792e0ddad2 (diff) | |
Merge tag 'v4.4.35' into linux-linaro-lsk-v4.4
This is the 4.4.35 stable release
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/power/main.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index ae60e6357d7b..e9b713675c7c 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1022,6 +1022,8 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a TRACE_DEVICE(dev); TRACE_SUSPEND(0); + dpm_wait_for_children(dev, async); + if (async_error) goto Complete; @@ -1033,8 +1035,6 @@ static int __device_suspend_noirq(struct device *dev, pm_message_t state, bool a if (dev->power.syscore || dev->power.direct_complete) goto Complete; - dpm_wait_for_children(dev, async); - if (dev->pm_domain) { info = "noirq power domain "; callback = pm_noirq_op(&dev->pm_domain->ops, state); @@ -1169,6 +1169,8 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as __pm_runtime_disable(dev, false); + dpm_wait_for_children(dev, async); + if (async_error) goto Complete; @@ -1180,8 +1182,6 @@ static int __device_suspend_late(struct device *dev, pm_message_t state, bool as if (dev->power.syscore || dev->power.direct_complete) goto Complete; - dpm_wait_for_children(dev, async); - if (dev->pm_domain) { info = "late power domain "; callback = pm_late_early_op(&dev->pm_domain->ops, state); |