summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-21 08:14:25 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-08 12:56:20 +0200
commite0654d0177a85490b3e61b080a09aace66805c0a (patch)
tree5cdcd9f79faac3c1b30214ae60929f7424aa9ec8 /arch
parentARM: imx_v6_v7_defconfig: Enable CONFIG_GPIO_MC9S08DZ60 (diff)
downloadlinux-e0654d0177a85490b3e61b080a09aace66805c0a.tar.xz
linux-e0654d0177a85490b3e61b080a09aace66805c0a.zip
ARM: imx: fix the return value check in imx_clk_busy_divider()
In case of error, the function clk_register() returns ERR_PTR() no NULL pointer. The NULL test in the return value check should be replaced with IS_ERR(). dpatch engine is used to auto generated this patch. (https://github.com/weiyj/dpatch) Signed-off-by: Wei Yongjun <yongjun_wei@trendmicro.com.cn> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-imx/clk-busy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-imx/clk-busy.c b/arch/arm/mach-imx/clk-busy.c
index 1a7a8dd045a1..1ab91b5209e6 100644
--- a/arch/arm/mach-imx/clk-busy.c
+++ b/arch/arm/mach-imx/clk-busy.c
@@ -108,7 +108,7 @@ struct clk *imx_clk_busy_divider(const char *name, const char *parent_name,
busy->div.hw.init = &init;
clk = clk_register(NULL, &busy->div.hw);
- if (!clk)
+ if (IS_ERR(clk))
kfree(busy);
return clk;