diff options
| author | Guennadi Liakhovetski | 2010-10-15 16:37:24 +0200 |
|---|---|---|
| committer | Paul Mundt | 2010-10-18 13:33:10 +0200 |
| commit | 56ea510962ec690ede2be2064de72e51a33011d9 (patch) | |
| tree | 67f8acf241a7723ab82909368fcdc347c006c3ce /arch/sh/boards/mach-ecovec24/setup.c | |
| parent | sh: clkfwk: Fix fault in frequency iterator. (diff) | |
| download | kernel-qcow2-linux-56ea510962ec690ede2be2064de72e51a33011d9.tar.gz kernel-qcow2-linux-56ea510962ec690ede2be2064de72e51a33011d9.tar.xz kernel-qcow2-linux-56ea510962ec690ede2be2064de72e51a33011d9.zip | |
sh: fix clk_get() error handling
clk_get() returns an ERR_PTR(errno) on error and not NULL.
Signed-off-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de>
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh/boards/mach-ecovec24/setup.c')
| -rw-r--r-- | arch/sh/boards/mach-ecovec24/setup.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sh/boards/mach-ecovec24/setup.c b/arch/sh/boards/mach-ecovec24/setup.c index 1d7b495a7db4..71a3368ab1fc 100644 --- a/arch/sh/boards/mach-ecovec24/setup.c +++ b/arch/sh/boards/mach-ecovec24/setup.c @@ -1248,14 +1248,14 @@ static int __init arch_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 B */ clk = clk_get(NULL, "fsib_clk"); - if (clk) { + if (!IS_ERR(clk)) { clk_register(&fsimckb_clk); clk_set_parent(clk, &fsimckb_clk); clk_set_rate(clk, 11000); @@ -1273,7 +1273,7 @@ static int __init arch_setup(void) /* set VPU clock to 166 MHz */ clk = clk_get(NULL, "vpu_clk"); - if (clk) { + if (!IS_ERR(clk)) { clk_set_rate(clk, clk_round_rate(clk, 166000000)); clk_put(clk); } |