From: Feng Hong <hongfeng@marvell.com>
Date: Wed, 19 Sep 2012 12:16:00 +0000 (+0200)
Subject: PM / Sleep: use resume event when call dpm_resume_early
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=997a031107ec962967ce36db9bc500f1fad491c1;p=linux-beck.git

PM / Sleep: use resume event when call dpm_resume_early

When dpm_suspend_noirq fail, state is PMSG_SUSPEND,
should change to PMSG_RESUME when dpm_resume_early is called

Signed-off-by: Feng Hong <hongfeng@marvell.com>
Signed-off-by: Raul Xiong <xjian@marvell.com>
Signed-off-by: Neil Zhang <zhangwm@marvell.com>
Cc: stable@vger.kernel.org
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
---

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 0113adc310dc..2700f2e4066f 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -996,7 +996,7 @@ int dpm_suspend_end(pm_message_t state)
 
 	error = dpm_suspend_noirq(state);
 	if (error) {
-		dpm_resume_early(state);
+		dpm_resume_early(resume_event(state));
 		return error;
 	}