diff options
Diffstat (limited to 'drivers/base/power/main.c')
| -rw-r--r-- | drivers/base/power/main.c | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 95d2f17ec264..7f5daccefdd1 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -1010,8 +1010,16 @@ static int dpm_suspend_late(pm_message_t state) int dpm_suspend_end(pm_message_t state) { int error = dpm_suspend_late(state); + if (error) + return error; + + error = dpm_suspend_noirq(state); + if (error) { + dpm_resume_early(state); + return error; + } - return error ? : dpm_suspend_noirq(state); + return 0; } EXPORT_SYMBOL_GPL(dpm_suspend_end); @@ -1054,7 +1062,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) dpm_wait_for_children(dev, async); if (async_error) - return 0; + goto Complete; pm_runtime_get_noresume(dev); if (pm_runtime_barrier(dev) && device_may_wakeup(dev)) @@ -1063,7 +1071,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) if (pm_wakeup_pending()) { pm_runtime_put_sync(dev); async_error = -EBUSY; - return 0; + goto Complete; } data.dev = dev; @@ -1132,6 +1140,7 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async) del_timer_sync(&timer); destroy_timer_on_stack(&timer); + Complete: complete_all(&dev->power.completion); if (error) { |