openwrtv4/target/linux/sunxi/patches-3.14/220-clk-sunxi-remove-calls-to-clk_put.patch
Zoltan Herpai f10f009609 sunxi: initial 3.14 patchset
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

SVN-Revision: 42313
2014-08-27 12:09:46 +00:00

41 lines
1.2 KiB
Diff

From 81b745ee30dc7cd230f924f6263879f1b7ffbc0c Mon Sep 17 00:00:00 2001
From: Maxime Ripard <maxime.ripard@free-electrons.com>
Date: Thu, 13 Mar 2014 16:14:13 +0100
Subject: [PATCH] clk: sunxi: Remove calls to clk_put
Callers of clk_put must disable the clock first. This also means that as long
as the clock is enabled the driver should hold a reference to that clock.
Hence, the call to clk_put here are bogus and should be removed.
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
---
drivers/clk/sunxi/clk-sunxi.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c
index 9afd8dd..a10a645 100644
--- a/drivers/clk/sunxi/clk-sunxi.c
+++ b/drivers/clk/sunxi/clk-sunxi.c
@@ -1325,17 +1325,13 @@ static void __init sunxi_clock_protect(void)
/* memory bus clock - sun5i+ */
clk = clk_get(NULL, "mbus");
- if (!IS_ERR(clk)) {
+ if (!IS_ERR(clk))
clk_prepare_enable(clk);
- clk_put(clk);
- }
/* DDR clock - sun4i+ */
clk = clk_get(NULL, "pll5_ddr");
- if (!IS_ERR(clk)) {
+ if (!IS_ERR(clk))
clk_prepare_enable(clk);
- clk_put(clk);
- }
}
static void __init sunxi_init_clocks(void)
--
2.0.3