From 6e81bb08a65f8e9ed03af00f19bc83e540aaba5e Mon Sep 17 00:00:00 2001 From: Francesco VIRLINZI Date: Fri, 13 Mar 2009 08:08:01 +0000 Subject: [PATCH] --- yaml --- r: 133333 b: refs/heads/master c: 50cca715a64b66ccf173767d94d4020ea0a6129c h: refs/heads/master i: 133331: d5b3a051407a6dea4a6efc36f7033fb2cc891d15 v: v3 --- [refs] | 2 +- trunk/arch/sh/kernel/cpu/clock.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index b5fb32af48b7..7554742ed9d1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9edb3fec2260b5a64e9ca9e09160b74f1b106e3 +refs/heads/master: 50cca715a64b66ccf173767d94d4020ea0a6129c diff --git a/trunk/arch/sh/kernel/cpu/clock.c b/trunk/arch/sh/kernel/cpu/clock.c index 3209a8740fa4..1dc896483b59 100644 --- a/trunk/arch/sh/kernel/cpu/clock.c +++ b/trunk/arch/sh/kernel/cpu/clock.c @@ -372,12 +372,14 @@ 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); }