You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
37 lines
1.1 KiB
Diff
37 lines
1.1 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(-)
|
|
|
|
--- a/drivers/clk/sunxi/clk-sunxi.c
|
|
+++ b/drivers/clk/sunxi/clk-sunxi.c
|
|
@@ -1325,17 +1325,13 @@ static void __init sunxi_clock_protect(v
|
|
|
|
/* 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)
|