diff options
| author | Magnus Damm | 2009-06-02 10:43:59 +0200 |
|---|---|---|
| committer | Paul Mundt | 2009-06-11 08:07:04 +0200 |
| commit | a50de78dc6d21ee074e9561c800d194bec12128b (patch) | |
| tree | b6203e3043da1898598db8d441b594a51903f742 /arch/sh/kernel/cpu | |
| parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torval... (diff) | |
| download | kernel-qcow2-linux-a50de78dc6d21ee074e9561c800d194bec12128b.tar.gz kernel-qcow2-linux-a50de78dc6d21ee074e9561c800d194bec12128b.tar.xz kernel-qcow2-linux-a50de78dc6d21ee074e9561c800d194bec12128b.zip | |
sh: clock div4 frequency table offset fix
This patch fixes the per clock offset calculation in
sh_clk_div4_register(). Without this patch the offset
to the frequency table for each clock is incorrect.
Signed-off-by: Magnus Damm <damm@igel.co.jp>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/kernel/cpu')
| -rw-r--r-- | arch/sh/kernel/cpu/clock-cpg.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/sh/kernel/cpu/clock-cpg.c b/arch/sh/kernel/cpu/clock-cpg.c index 88fc30d2f5fd..e604a6f80194 100644 --- a/arch/sh/kernel/cpu/clock-cpg.c +++ b/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; |