target/linux/sunxi/patches-3.14/220-clk-sunxi-remove-calls-to-clk_put.patch

   1 From 81b745ee30dc7cd230f924f6263879f1b7ffbc0c Mon Sep 17 00:00:00 2001
   2 From: Maxime Ripard <maxime.ripard@free-electrons.com>
   3 Date: Thu, 13 Mar 2014 16:14:13 +0100
   4 Subject: [PATCH] clk: sunxi: Remove calls to clk_put
   5
   6 Callers of clk_put must disable the clock first. This also means that as long
   7 as the clock is enabled the driver should hold a reference to that clock.
   8 Hence, the call to clk_put here are bogus and should be removed.
   9
  10 Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
  11 ---
  12  drivers/clk/sunxi/clk-sunxi.c | 8 ++------
  13  1 file changed, 2 insertions(+), 6 deletions(-)
  14
  15 --- a/drivers/clk/sunxi/clk-sunxi.c
  16 +++ b/drivers/clk/sunxi/clk-sunxi.c
  17 @@ -1325,17 +1325,13 @@ static void __init sunxi_clock_protect(v
  18
  19         /* memory bus clock - sun5i+ */
  20         clk = clk_get(NULL, "mbus");
  21 -       if (!IS_ERR(clk)) {
  22 +       if (!IS_ERR(clk))
  23                 clk_prepare_enable(clk);
  24 -               clk_put(clk);
  25 -       }
  26
  27         /* DDR clock - sun4i+ */
  28         clk = clk_get(NULL, "pll5_ddr");
  29 -       if (!IS_ERR(clk)) {
  30 +       if (!IS_ERR(clk))
  31                 clk_prepare_enable(clk);
  32 -               clk_put(clk);
  33 -       }
  34  }
  35
  36  static void __init sunxi_init_clocks(void)