]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
clk: samsung: always allocate the clk_table
authorHeiko Stuebner <heiko@sntech.de>
Mon, 18 Mar 2013 04:43:52 +0000 (13:43 +0900)
committerKukjin Kim <kgene.kim@samsung.com>
Thu, 28 Mar 2013 05:46:26 +0000 (14:46 +0900)
This is needed to allow looking up previous created clocks when
adding separate aliases to them.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Acked-by: Mike Turquette <mturquette@linaro.org>
Signed-off-by: Kukjin Kim <kgene.kim@samsung.com>
drivers/clk/samsung/clk.c

index ca04b9e61588a9b33ab14ab4aef3fd13bb90685c..1ed571606395cef04987232612861453ad9d5a91 100644 (file)
@@ -76,14 +76,14 @@ void __init samsung_clk_init(struct device_node *np, void __iomem *base,
        }
 #endif
 
-       if (!np)
-               return;
-
-#ifdef CONFIG_OF
        clk_table = kzalloc(sizeof(struct clk *) * nr_clks, GFP_KERNEL);
        if (!clk_table)
                panic("could not allocate clock lookup table\n");
 
+       if (!np)
+               return;
+
+#ifdef CONFIG_OF
        clk_data.clks = clk_table;
        clk_data.clk_num = nr_clks;
        of_clk_add_provider(np, of_clk_src_onecell_get, &clk_data);