clk: amba bus: convert to clk_prepare()/clk_unprepare()

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

1 files changed, 10 insertions, 1 deletions

diff --git a/drivers/amba/bus.c b/drivers/amba/bus.c
index 84bdaace56c8..bd230e801131 100644
--- a/drivers/amba/bus.c
+++ b/drivers/amba/bus.c
@@ -460,9 +460,17 @@ static int amba_get_enable_pclk(struct amba_device *pcdev)
         if (IS_ERR(pclk))
                 return PTR_ERR(pclk);
 
+        ret = clk_prepare(pclk);
+        if (ret) {
+                clk_put(pclk);
+                return ret;
+        }
+
         ret = clk_enable(pclk);
-        if (ret)
+        if (ret) {
+                clk_unprepare(pclk);
                 clk_put(pclk);
+        }
 
         return ret;
 }
@@ -472,6 +480,7 @@ static void amba_put_disable_pclk(struct amba_device *pcdev)
         struct clk *pclk = pcdev->pclk;
 
         clk_disable(pclk);
+        clk_unprepare(pclk);
         clk_put(pclk);
 }