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-Tag: v3.5.7~113
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fe3ea33e4ee9c88082e186c81690a62d99417573;p=thirdparty%2Fkernel%2Fstable.git

PM / Sleep: use resume event when call dpm_resume_early

commit 997a031107ec962967ce36db9bc500f1fad491c1 upstream.

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>
Signed-off-by: Rafael J. Wysocki <rjw@sisk.pl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c
index 742fcbe12ccf8..9d54dceeddada 100644
--- a/drivers/base/power/main.c
+++ b/drivers/base/power/main.c
@@ -994,7 +994,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;
 	}