From dd23210d28373909b13e85107dc2320505b33695 Mon Sep 17 00:00:00 2001 From: Linus Walleij Date: Wed, 11 Jan 2012 09:51:14 +0100 Subject: [PATCH] --- yaml --- r: 295741 b: refs/heads/master c: d3e8b7569ad733c063a95dc1a51928e6e7c40652 h: refs/heads/master i: 295739: 58b26303611c8d92aa904e904f414d6304baaed9 v: v3 --- [refs] | 2 +- trunk/arch/arm/plat-nomadik/timer.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index fbd9f2394d40..13a83afbe04e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b9576623c4217a5d753c272158e1e108c25a1a57 +refs/heads/master: d3e8b7569ad733c063a95dc1a51928e6e7c40652 diff --git a/trunk/arch/arm/plat-nomadik/timer.c b/trunk/arch/arm/plat-nomadik/timer.c index 46f50f24205f..954a862ec4aa 100644 --- a/trunk/arch/arm/plat-nomadik/timer.c +++ b/trunk/arch/arm/plat-nomadik/timer.c @@ -190,8 +190,8 @@ void __init nmdk_timer_init(void __iomem *base) mtu_base = base; clk0 = clk_get_sys("mtu0", NULL); BUG_ON(IS_ERR(clk0)); - - clk_enable(clk0); + BUG_ON(clk_prepare(clk0) < 0); + BUG_ON(clk_enable(clk0) < 0); /* * Tick rate is 2.4MHz for Nomadik and 2.4Mhz, 100MHz or 133 MHz