summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mm-imx3.c
diff options
context:
space:
mode:
authorMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-30 22:39:02 +0400
committerMark Brown <broonie@opensource.wolfsonmicro.com>2012-10-30 22:39:02 +0400
commit31271e9aacaa3c3460cbad8ec62fb5a04a522f5b (patch)
tree815c671dac14e0e07959dc88e94c36a994f9c460 /arch/arm/mach-imx/mm-imx3.c
parent32111abb508424d1d110fa471d940160abe251f5 (diff)
parentdc4dc36056392c0b0b1ca9e81bebff964b9297e0 (diff)
downloadlinux-31271e9aacaa3c3460cbad8ec62fb5a04a522f5b.tar.xz
Merge branch 'spi-tegra' into spi-next
Diffstat (limited to 'arch/arm/mach-imx/mm-imx3.c')
-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;
}