diff options
| author | Feng Hong <hongfeng@marvell.com> | 2012-09-19 14:16:00 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-10-13 05:46:56 +0900 |
| commit | fe3ea33e4ee9c88082e186c81690a62d99417573 (patch) | |
| tree | edbac16586e2c2ce7e718f277fd5fb9b762d2b59 /drivers | |
| parent | 7a3cfd58d45ec9602a8d766711bc348ac8d97be6 (diff) | |
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>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/base/power/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 742fcbe12ccf..9d54dceeddad 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; } |