PM / Sleep: use resume event when call dpm_resume_early
authorFeng Hong <hongfeng@marvell.com>
Wed, 19 Sep 2012 12:16:00 +0000 (14:16 +0200)
committerRafael J. Wysocki <rjw@sisk.pl>
Wed, 19 Sep 2012 12:16:00 +0000 (14:16 +0200)
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>
drivers/base/power/main.c

index 0113adc..2700f2e 100644 (file)
@@ -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;
        }