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:38:39 +0900 |
| commit | 24a0c2063c805e9cf1f3f418bb7f444b5b3f0e4e (patch) | |
| tree | 10eb417364c6a95b2614c2c4f6d353da70f54c97 /drivers/base | |
| parent | a332509fcd9064cae48d26e09aec46e08247223b (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/base')
| -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 f7eff25ffe4..ebc272f8cf2 100644 --- a/drivers/base/power/main.c +++ b/drivers/base/power/main.c @@ -984,7 +984,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; } |