linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] PM / Sleep: use resume event when call dpm_resume_early
@ 2012-09-19  3:17 hongfeng
  2012-09-19 12:32 ` Rafael J. Wysocki
  0 siblings, 1 reply; 2+ messages in thread
From: hongfeng @ 2012-09-19  3:17 UTC (permalink / raw)
  To: pavel, rjw, len.brown, gregkh
  Cc: linux-pm, linux-kernel, hongfeng, Raul Xiong, Neil Zhang

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>
---
 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;
 	}
 
-- 
1.7.0.4


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] PM / Sleep: use resume event when call dpm_resume_early
  2012-09-19  3:17 [PATCH] PM / Sleep: use resume event when call dpm_resume_early hongfeng
@ 2012-09-19 12:32 ` Rafael J. Wysocki
  0 siblings, 0 replies; 2+ messages in thread
From: Rafael J. Wysocki @ 2012-09-19 12:32 UTC (permalink / raw)
  To: hongfeng
  Cc: pavel, len.brown, gregkh, linux-pm, linux-kernel, Raul Xiong, Neil Zhang

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;
>  	}
>  
> 


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2012-09-19 12:25 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-09-19  3:17 [PATCH] PM / Sleep: use resume event when call dpm_resume_early hongfeng
2012-09-19 12:32 ` Rafael J. Wysocki

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).