clk: amba bus: convert to clk_prepare()/clk_unprepare()
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 84bdaac..bd230e8 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -460,9 +460,17 @@
if (IS_ERR(pclk))
return PTR_ERR(pclk);
- ret = clk_enable(pclk);
- if (ret)
+ ret = clk_prepare(pclk);
+ if (ret) {
clk_put(pclk);
+ return ret;
+ }
+
+ ret = clk_enable(pclk);
+ if (ret) {
+ clk_unprepare(pclk);
+ clk_put(pclk);
+ }
return ret;
}
@@ -472,6 +480,7 @@
struct clk *pclk = pcdev->pclk;
clk_disable(pclk);
+ clk_unprepare(pclk);
clk_put(pclk);
}