On Tue, Apr 17, 2012 at 4:15 AM, Viresh Kumar <viresh.kumar@xxxxxx> wrote: > With common clock framework, it is must to call clk_{un}prepare() before/after > clk_{dis}enable. This patch fixes this for SPEAr timer. > > Signed-off-by: Viresh Kumar <viresh.kumar@xxxxxx> > --- > arch/arm/plat-spear/time.c | 8 ++++---- > 1 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm/plat-spear/time.c b/arch/arm/plat-spear/time.c > index a3164d1..4f05d26 100644 > --- a/arch/arm/plat-spear/time.c > +++ b/arch/arm/plat-spear/time.c > @@ -218,10 +218,10 @@ void __init spear_setup_timer(resource_size_t base, int irq) > goto err_iomap; > } > > - ret = clk_enable(gpt_clk); > + ret = clk_prepare_enable(gpt_clk); Where do you call clk_enable? Further down in the code somewhere? Also does this change break git bisect for your platform? Maybe you should move this change before patch 12/13 to prevent run-time breakage? Regards, Mike > if (ret < 0) { > - pr_err("%s:couldn't enable gpt clock\n", __func__); > - goto err_clk; > + pr_err("%s:couldn't prepare-enable gpt clock\n", __func__); > + goto err_prepare_enable_clk; > } > > spear_clockevent_init(irq); > @@ -229,7 +229,7 @@ void __init spear_setup_timer(resource_size_t base, int irq) > > return; > > -err_clk: > +err_prepare_enable_clk: > clk_put(gpt_clk); > err_iomap: > iounmap(gpt_base); > -- > 1.7.9 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/linux-arm-kernel