Merge branches 'pm-core', 'pm-qos' and 'pm-avs'

[mirror_ubuntu-artful-kernel.git] / drivers / base / power / main.c

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 2932a5bd892f7e2b400d5b806c7df36b3cdc30a8..eb474c882ebe058f33d589e0cbf28cca8da818ef 100644 (file)
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -1460,10 +1460,10 @@ static int __device_suspend(struct device *dev, pm_message_t state, bool async)
        dpm_watchdog_clear(&wd);
 
  Complete:
-       complete_all(&dev->power.completion);
        if (error)
                async_error = error;
 
+       complete_all(&dev->power.completion);
        TRACE_SUSPEND(error);
        return error;
 }