diff mbox

sh-clkfwk Safer resume from hibenration

Message ID 49BA1461.7070207@st.com (mailing list archive)
State Accepted
Headers show

Commit Message

Francesco VIRLINZI March 13, 2009, 8:08 a.m. UTC

Comments

Jean-Christophe PLAGNIOL-VILLARD March 13, 2009, 4:33 p.m. UTC | #1
On 09:08 Fri 13 Mar     , Francesco VIRLINZI wrote:
>

> >From 444e5623bfb9ceae22b6190dfcc003cb19efcf71 Mon Sep 17 00:00:00 2001
> From: Francesco Virlinzi <francesco.virlinzi@st.com>
> Date: Fri, 13 Mar 2009 08:39:26 +0100
> Subject: [PATCH] sh: clkfwk: Safer resume from hibenration
> 
> This patch fixes a possible problem in the resume from
> hibenration. It temporaneally saves the clk->rate on the
> stack to avoid any possible change during the clk->set_parent(..)
> call
> 
> Signed-off-by: Francesco Virlinzi <francesco.virlinzi@st.com>
> ---
>  arch/sh/kernel/cpu/clock.c |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)
> 
> diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c
> index 3209a87..e2d2451 100644
> --- a/arch/sh/kernel/cpu/clock.c
> +++ b/arch/sh/kernel/cpu/clock.c
> @@ -372,12 +372,13 @@ static int clks_sysdev_suspend(struct sys_device *dev, pm_message_t state)
>  		if (prev_state.event == PM_EVENT_FREEZE) {
>  			list_for_each_entry(clkp, &clock_list, node)
>  				if (likely(clkp->ops)) {
> +					unsigned long rate = clkp->rate;
please add an empty line
>  					if (likely(clkp->ops->set_parent))
>  						clkp->ops->set_parent(clkp,
>  							clkp->parent);
>  					if (likely(clkp->ops->set_rate))
>  						clkp->ops->set_rate(clkp,
> -							clkp->rate, NO_CHANGE);
> +							rate, NO_CHANGE);
>  					else if (likely(clkp->ops->recalc))
>  						clkp->ops->recalc(clkp);
>  					}
> -- 
> 1.5.6.6
> 
Best Regards,
J.
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

From 444e5623bfb9ceae22b6190dfcc003cb19efcf71 Mon Sep 17 00:00:00 2001
From: Francesco Virlinzi <francesco.virlinzi@st.com>
Date: Fri, 13 Mar 2009 08:39:26 +0100
Subject: [PATCH] sh: clkfwk: Safer resume from hibenration

This patch fixes a possible problem in the resume from
hibenration. It temporaneally saves the clk->rate on the
stack to avoid any possible change during the clk->set_parent(..)
call

Signed-off-by: Francesco Virlinzi <francesco.virlinzi@st.com>
---
 arch/sh/kernel/cpu/clock.c |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/arch/sh/kernel/cpu/clock.c b/arch/sh/kernel/cpu/clock.c
index 3209a87..e2d2451 100644
--- a/arch/sh/kernel/cpu/clock.c
+++ b/arch/sh/kernel/cpu/clock.c
@@ -372,12 +372,13 @@  static int clks_sysdev_suspend(struct sys_device *dev, pm_message_t state)
 		if (prev_state.event == PM_EVENT_FREEZE) {
 			list_for_each_entry(clkp, &clock_list, node)
 				if (likely(clkp->ops)) {
+					unsigned long rate = clkp->rate;
 					if (likely(clkp->ops->set_parent))
 						clkp->ops->set_parent(clkp,
 							clkp->parent);
 					if (likely(clkp->ops->set_rate))
 						clkp->ops->set_rate(clkp,
-							clkp->rate, NO_CHANGE);
+							rate, NO_CHANGE);
 					else if (likely(clkp->ops->recalc))
 						clkp->ops->recalc(clkp);
 					}
-- 
1.5.6.6