diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 06:55:11 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-30 06:55:11 +0100 |
| commit | 7d0dbea312a6508389241b4fb6cda1c4d1e32d6e (patch) | |
| tree | f23b591e8c6f921c91fce00a6453d4087ec3c071 /arch/sh/boards/mach-se | |
| parent | Merge branches 'sh/core', 'sh/io-overhaul' and 'sh/urgent' into sh-latest (diff) | |
| parent | sh: boards: mach-se: use IS_ERR() instead of NULL check (diff) | |
| download | linux-7d0dbea312a6508389241b4fb6cda1c4d1e32d6e.tar.xz linux-7d0dbea312a6508389241b4fb6cda1c4d1e32d6e.zip | |
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.c | 4 |
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) /* set SPU2 clock to 83.4 MHz */ clk = clk_get(NULL, "spu_clk"); - if (clk) { + if (!IS_ERR(clk)) { clk_set_rate(clk, clk_round_rate(clk, 83333333)); clk_put(clk); } /* change parent of FSI A */ clk = clk_get(NULL, "fsia_clk"); - if (clk) { + if (!IS_ERR(clk)) { clk_register(&fsimcka_clk); clk_set_parent(clk, &fsimcka_clk); clk_set_rate(clk, 11000); |