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);