From 6f5ad96301d4b897f09a893d331a0b18b3fff6b1 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 22 Sep 2011 11:38:40 +0100 Subject: [PATCH] clk: timer-sp: convert to clk_prepare()/clk_unprepare() Signed-off-by: Russell King --- arch/arm/common/timer-sp.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/arch/arm/common/timer-sp.c b/arch/arm/common/timer-sp.c index 41df47875122..2393b5bc96fa 100644 --- a/arch/arm/common/timer-sp.c +++ b/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); } -- 2.39.5