diff options
author | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-05-09 23:33:36 -0400 |
---|---|---|
committer | Maxime Ripard <maxime.ripard@free-electrons.com> | 2014-06-11 03:58:44 -0400 |
commit | 2c6fba1038f2b27fffe7ab0ddd42f9f283128105 (patch) | |
tree | d27cdca4191a7017f2f71828cb99e74f49018b34 | |
parent | 6d1d14d5ce3e7880f91e7cfbdeca88128fe741ca (diff) |
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>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Emilio López <emilio@elopez.com.ar>
-rw-r--r-- | drivers/clk/sunxi/clk-sunxi.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/drivers/clk/sunxi/clk-sunxi.c b/drivers/clk/sunxi/clk-sunxi.c index bf5075e4b20f..9bfa21ac04f4 100644 --- a/drivers/clk/sunxi/clk-sunxi.c +++ b/drivers/clk/sunxi/clk-sunxi.c | |||
@@ -1339,17 +1339,13 @@ static void __init sunxi_clock_protect(void) | |||
1339 | 1339 | ||
1340 | /* memory bus clock - sun5i+ */ | 1340 | /* memory bus clock - sun5i+ */ |
1341 | clk = clk_get(NULL, "mbus"); | 1341 | clk = clk_get(NULL, "mbus"); |
1342 | if (!IS_ERR(clk)) { | 1342 | if (!IS_ERR(clk)) |
1343 | clk_prepare_enable(clk); | 1343 | clk_prepare_enable(clk); |
1344 | clk_put(clk); | ||
1345 | } | ||
1346 | 1344 | ||
1347 | /* DDR clock - sun4i+ */ | 1345 | /* DDR clock - sun4i+ */ |
1348 | clk = clk_get(NULL, "pll5_ddr"); | 1346 | clk = clk_get(NULL, "pll5_ddr"); |
1349 | if (!IS_ERR(clk)) { | 1347 | if (!IS_ERR(clk)) |
1350 | clk_prepare_enable(clk); | 1348 | clk_prepare_enable(clk); |
1351 | clk_put(clk); | ||
1352 | } | ||
1353 | } | 1349 | } |
1354 | 1350 | ||
1355 | static void __init sunxi_init_clocks(struct device_node *np) | 1351 | static void __init sunxi_init_clocks(struct device_node *np) |