| Message ID | 1348024674-13050-1-git-send-email-hongfeng@marvell.com (mailing list archive) |
|---|---|
| State | Accepted, archived |
| Headers | show |
On Wednesday, September 19, 2012, hongfeng wrote: > When dpm_suspend_noirq fail, state is PMSG_SUSPEND, > should change to PMSG_RESUME when dpm_resume_early is called > > Change-Id: If815218d4934b4648e330235ab1ae26e713284bd > Signed-off-by: Feng Hong <hongfeng@marvell.com> > Signed-off-by: Raul Xiong <xjian@marvell.com> > Signed-off-by: Neil Zhang <zhangwm@marvell.com> Applied to the linux-next branch of the linux-pm.git tree as v3.7 material. Thanks, Rafael > --- > 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 0113adc..2700f2e 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; > } > > -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/base/power/main.c b/drivers/base/power/main.c index 0113adc..2700f2e 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; }