diff options
| author |   Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> | 2010-05-13 01:08:33 +0000 |
|---|---|---|
| committer |   Paul Mundt <lethal@linux-sh.org> | 2010-05-13 17:39:31 +0900 |
| commit | 103058536300f80ec54f2a8c9209d066925416fd (patch) | |
| tree | 018cb2b9ead7a6f705befa36a473ab65b334937f /arch/sh/boards/mach-ecovec24/setup.c | |
| parent | sh: move sh clock-cpg.c contents to drivers/sh/clk-cpg.c (diff) | |
| download | linux-dev-103058536300f80ec54f2a8c9209d066925416fd.tar.xz linux-dev-103058536300f80ec54f2a8c9209d066925416fd.zip | |
sh: Check return value of clk_get on ecovec24
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to '')
| -rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 1850c087a93b..62123885a6fa 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -1136,16 +1136,20 @@ static int __init arch_setup(void) /* set SPU2 clock to 83.4 MHz */ clk = clk_get(NULL, "spu_clk"); - clk_set_rate(clk, clk_round_rate(clk, 83333333)); - clk_put(clk); + if (clk) { + clk_set_rate(clk, clk_round_rate(clk, 83333333)); + clk_put(clk); + } /* change parent of FSI B */ clk = clk_get(NULL, "fsib_clk"); - clk_register(&fsimckb_clk); - clk_set_parent(clk, &fsimckb_clk); - clk_set_rate(clk, 11000); - clk_set_rate(&fsimckb_clk, 11000); - clk_put(clk); + if (clk) { + clk_register(&fsimckb_clk); + clk_set_parent(clk, &fsimckb_clk); + clk_set_rate(clk, 11000); + clk_set_rate(&fsimckb_clk, 11000); + clk_put(clk); + } gpio_request(GPIO_PTU0, NULL); gpio_direction_output(GPIO_PTU0, 0); @@ -1157,8 +1161,10 @@ static int __init arch_setup(void) /* set VPU clock to 166 MHz */ clk = clk_get(NULL, "vpu_clk"); - clk_set_rate(clk, clk_round_rate(clk, 166000000)); - clk_put(clk); + if (clk) { + clk_set_rate(clk, clk_round_rate(clk, 166000000)); + clk_put(clk); + } /* enable IrDA */ gpio_request(GPIO_FN_IRDA_OUT, NULL); |