aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/clk/samsung/clk.c
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2013-03-18 13:43:52 +0900
committerKukjin Kim <kgene.kim@samsung.com>2013-03-28 14:46:26 +0900
commit6e92bf5a01afb1f897aa15a34517da07d7c0c320 (patch)
treedd4a0da10e0538a037dd5e55533d666b2d8bd664 /drivers/clk/samsung/clk.c
parentclk: samsung: fix pm init on non-dt platforms (diff)
downloadlinux-dev-6e92bf5a01afb1f897aa15a34517da07d7c0c320.tar.xz
linux-dev-6e92bf5a01afb1f897aa15a34517da07d7c0c320.zip
clk: samsung: always allocate the clk_table
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>
Diffstat (limited to 'drivers/clk/samsung/clk.c')
-rw-r--r--drivers/clk/samsung/clk.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/clk/samsung/clk.c b/drivers/clk/samsung/clk.c
index ca04b9e61588..1ed571606395 100644
--- a/drivers/clk/samsung/clk.c
+++ b/drivers/clk/samsung/clk.c
@@ -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);