diff options
| author | Feng Hong <hongfeng@marvell.com> | 2012-09-19 14:16:00 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rjw@sisk.pl> | 2012-09-19 14:16:00 +0200 |
| commit | 997a031107ec962967ce36db9bc500f1fad491c1 (patch) | |
| tree | b191d37389ad3a44784c22e05dbc037877f882b4 /drivers/base | |
| parent | properly __init-annotate pm_sysrq_init() (diff) | |
| download | linux-997a031107ec962967ce36db9bc500f1fad491c1.tar.xz linux-997a031107ec962967ce36db9bc500f1fad491c1.zip | |
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>
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 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; } |