summaryrefslogtreecommitdiffstats
path: root/arch/sh
diff options
context:
space:
mode:
authorVasiliy Kulikov2010-11-26 18:06:28 +0100
committerPaul Mundt2010-11-29 04:59:28 +0100
commit193006f7e3b1abd42d7a3677b54fa2996461a842 (patch)
tree68410dfcc5fd3d2658f4e21e7c9df4f556d616ca /arch/sh
parentsh: Add div6_reparent_clks to clock framework for FSI (diff)
downloadkernel-qcow2-linux-193006f7e3b1abd42d7a3677b54fa2996461a842.tar.gz
kernel-qcow2-linux-193006f7e3b1abd42d7a3677b54fa2996461a842.tar.xz
kernel-qcow2-linux-193006f7e3b1abd42d7a3677b54fa2996461a842.zip
sh: boards: mach-se: use IS_ERR() instead of NULL check
clk_get() returns ERR_PTR() on error, not NULL. Signed-off-by: Vasiliy Kulikov <segoon@openwall.com> Reviewed-by: Guennadi Liakhovetski <g.liakhovetski@gmx.de> Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'arch/sh')
-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)
/* 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);