diff --git a/[refs] b/[refs]
index 93a6370c2c8b..dd5de93d8577 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cf9fe114e3b37e14fc8434d5abb192e35df551b1
+refs/heads/master: a50de78dc6d21ee074e9561c800d194bec12128b
diff --git a/trunk/arch/sh/kernel/cpu/clock-cpg.c b/trunk/arch/sh/kernel/cpu/clock-cpg.c
index 88fc30d2f5fd..e604a6f80194 100644
--- a/trunk/arch/sh/kernel/cpu/clock-cpg.c
+++ b/trunk/arch/sh/kernel/cpu/clock-cpg.c
@@ -71,8 +71,9 @@ int __init sh_clk_div4_register(struct clk *clks, int nr,
 	int ret = 0;
 	int k;
 
-	k = nr_divs + 1;
-	freq_table = alloc_bootmem(freq_table_size * nr * (nr_divs + 1));
+	freq_table_size *= (nr_divs + 1);
+
+	freq_table = alloc_bootmem(freq_table_size * nr);
 	if (!freq_table)
 		return -ENOMEM;