From 517786f8e8cc52379d422f65c4bc65f6865bb20c Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 22 Sep 2011 11:38:40 +0100 Subject: [PATCH] --- yaml --- r: 269440 b: refs/heads/master c: 6f5ad96301d4b897f09a893d331a0b18b3fff6b1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/common/timer-sp.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 3a64db762588..2d1c70fe8fd6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 72ae00c970cf1e6027c5b719f42e7eff0aa1c1d9 +refs/heads/master: 6f5ad96301d4b897f09a893d331a0b18b3fff6b1 diff --git a/trunk/arch/arm/common/timer-sp.c b/trunk/arch/arm/common/timer-sp.c index 41df47875122..2393b5bc96fa 100644 --- a/trunk/arch/arm/common/timer-sp.c +++ b/trunk/arch/arm/common/timer-sp.c @@ -41,9 +41,17 @@ static long __init sp804_get_clock_rate(const char *name) return PTR_ERR(clk); } + err = clk_prepare(clk); + if (err) { + pr_err("sp804: %s clock failed to prepare: %d\n", name, err); + clk_put(clk); + return err; + } + err = clk_enable(clk); if (err) { pr_err("sp804: %s clock failed to enable: %d\n", name, err); + clk_unprepare(clk); clk_put(clk); return err; } @@ -52,6 +60,7 @@ static long __init sp804_get_clock_rate(const char *name) if (rate < 0) { pr_err("sp804: %s clock failed to get rate: %ld\n", name, rate); clk_disable(clk); + clk_unprepare(clk); clk_put(clk); }