Merge branch 'pm-sleep'

* pm-sleep:
  PM / Sleep: call early resume handlers when suspend_noirq fails

1 files changed, 9 insertions, 1 deletions

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 61a891dda380..0113adc310dc 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -991,8 +991,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;
 
-	return error ? : dpm_suspend_noirq(state);
+	error = dpm_suspend_noirq(state);
+	if (error) {
+		dpm_resume_early(state);
+		return error;
+	}
+
+	return 0;
 }
 EXPORT_SYMBOL_GPL(dpm_suspend_end);