aboutsummaryrefslogtreecommitdiffstats
path: root/arch/sh/boards/mach-se
diff options
context:
space:
mode:
authorPaul Mundt <lethal@linux-sh.org>2010-11-30 00:55:11 -0500
committerPaul Mundt <lethal@linux-sh.org>2010-11-30 00:55:11 -0500
commit7d0dbea312a6508389241b4fb6cda1c4d1e32d6e (patch)
treef23b591e8c6f921c91fce00a6453d4087ec3c071 /arch/sh/boards/mach-se
parent5c4986b8a9ddd9cf649abe38a102866f7809b1d2 (diff)
parent193006f7e3b1abd42d7a3677b54fa2996461a842 (diff)
Merge branch 'sh/urgent' into sh-latest
Diffstat (limited to 'arch/sh/boards/mach-se')
-rw-r--r--arch/sh/boards/mach-se/7724/setup.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sh/boards/mach-se/7724/setup.c b/arch/sh/boards/mach-se/7724/setup.c
index c31d228fdfc6..673530500e27 100644
--- a/arch/sh/boards/mach-se/7724/setup.c
+++ b/arch/sh/boards/mach-se/7724/setup.c
@@ -871,14 +871,14 @@ static int __init devices_setup(void)
871 871
872 /* set SPU2 clock to 83.4 MHz */ 872 /* set SPU2 clock to 83.4 MHz */
873 clk = clk_get(NULL, "spu_clk"); 873 clk = clk_get(NULL, "spu_clk");
874 if (clk) { 874 if (!IS_ERR(clk)) {
875 clk_set_rate(clk, clk_round_rate(clk, 83333333)); 875 clk_set_rate(clk, clk_round_rate(clk, 83333333));
876 clk_put(clk); 876 clk_put(clk);
877 } 877 }
878 878
879 /* change parent of FSI A */ 879 /* change parent of FSI A */
880 clk = clk_get(NULL, "fsia_clk"); 880 clk = clk_get(NULL, "fsia_clk");
881 if (clk) { 881 if (!IS_ERR(clk)) {
882 clk_register(&fsimcka_clk); 882 clk_register(&fsimcka_clk);
883 clk_set_parent(clk, &fsimcka_clk); 883 clk_set_parent(clk, &fsimcka_clk);
884 clk_set_rate(clk, 11000); 884 clk_set_rate(clk, 11000);