summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWei Yongjun <yongjun_wei@trendmicro.com.cn>2012-09-27 07:54:01 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2012-10-08 11:25:27 +0200
commit1d10ecf8371be22c68b2e52e7376c7075c97f656 (patch)
treed07083fe04c11c2d32a4405b8245523ca09fe60f
parentLinux 3.6 (diff)
downloadlinux-1d10ecf8371be22c68b2e52e7376c7075c97f656.tar.xz
linux-1d10ecf8371be22c68b2e52e7376c7075c97f656.zip
ARM: imx: fix return value check in imx3_init_l2x0()
In case of error, the function ioremap() returns NULL not ERR_PTR(). The IS_ERR() test in the return value check should be replaced with NULL test. dpatch engine is used to auto generate 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>
-rw-r--r--arch/arm/mach-imx/mm-imx3.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mm-imx3.c b/arch/arm/mach-imx/mm-imx3.c
index 9d2c843bde02..b5deb0554552 100644
--- a/arch/arm/mach-imx/mm-imx3.c
+++ b/arch/arm/mach-imx/mm-imx3.c
@@ -108,9 +108,8 @@ void __init imx3_init_l2x0(void)
}
l2x0_base = ioremap(MX3x_L2CC_BASE_ADDR, 4096);
- if (IS_ERR(l2x0_base)) {
- printk(KERN_ERR "remapping L2 cache area failed with %ld\n",
- PTR_ERR(l2x0_base));
+ if (!l2x0_base) {
+ printk(KERN_ERR "remapping L2 cache area failed\n");
return;
}