From mboxrd@z Thu Jan 1 00:00:00 1970 From: Francesco VIRLINZI Date: Fri, 13 Mar 2009 08:08:01 +0000 Subject: [PATCH] sh-clkfwk Safer resume from hibenration Message-Id: <49BA1461.7070207@st.com> MIME-Version: 1 Content-Type: multipart/mixed; boundary="------------020001090605050904030806" List-Id: To: linux-sh@vger.kernel.org This is a multi-part message in MIME format. --------------020001090605050904030806 Content-Type: text/plain; charset=ISO-8859-15; format=flowed Content-Transfer-Encoding: 7bit --------------020001090605050904030806 Content-Type: text/x-patch; name="0001-sh-clkfwk-Safer-resume-from-hibenration.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-sh-clkfwk-Safer-resume-from-hibenration.patch" >From 444e5623bfb9ceae22b6190dfcc003cb19efcf71 Mon Sep 17 00:00:00 2001 From: Francesco Virlinzi 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 --- 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 --------------020001090605050904030806--