From 7741295c7bed514c8f4f65c68f1855a84e3beb95 Mon Sep 17 00:00:00 2001 From: Heiko Stuebner Date: Mon, 18 Mar 2013 13:43:52 +0900 Subject: [PATCH] --- yaml --- r: 372460 b: refs/heads/master c: 6e92bf5a01afb1f897aa15a34517da07d7c0c320 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/clk/samsung/clk.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 0b8e1cbaebd8..b89de5dda82d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2466196d3e4f1fbe902ca8480bf4a03db78572b2 +refs/heads/master: 6e92bf5a01afb1f897aa15a34517da07d7c0c320 diff --git a/trunk/drivers/clk/samsung/clk.c b/trunk/drivers/clk/samsung/clk.c index ca04b9e61588..1ed571606395 100644 --- a/trunk/drivers/clk/samsung/clk.c +++ b/trunk/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);