diff options
| author | Olof Johansson <olof@lixom.net> | 2012-01-26 23:15:11 -0800 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-01-26 23:15:11 -0800 |
| commit | 5e9638643132795e6168bb483e883b6a9678e7b5 (patch) | |
| tree | b167a5233d24ba35330d97717c95d77019646805 /arch | |
| parent | d8c4cd7463ab4b09aa0b1bd79f36c3ebacd2cc77 (diff) | |
| parent | 945f82f25f9c49b93c315e0acc6d965cb37e137f (diff) | |
| download | linux-3.10-5e9638643132795e6168bb483e883b6a9678e7b5.tar.gz linux-3.10-5e9638643132795e6168bb483e883b6a9678e7b5.tar.bz2 linux-3.10-5e9638643132795e6168bb483e883b6a9678e7b5.zip | |
Merge branch 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6 into fixes
* 'imx-fixes' of git://git.pengutronix.de/git/imx/linux-2.6:
arch/arm/mach-imx/mach-mx53_ard.c: add missing iounmap
ARM: imx: iomux-v1.h: Fix build error due to __init annotation
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-mx5/board-mx53_ard.c | 4 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/iomux-v1.h | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/arm/mach-mx5/board-mx53_ard.c b/arch/arm/mach-mx5/board-mx53_ard.c index 5f224f1c3eb..d4aac813cca 100644 --- a/arch/arm/mach-mx5/board-mx53_ard.c +++ b/arch/arm/mach-mx5/board-mx53_ard.c @@ -189,8 +189,10 @@ static int weim_cs_config(void) return -ENOMEM; iomuxc_base = ioremap(MX53_IOMUXC_BASE_ADDR, SZ_4K); - if (!iomuxc_base) + if (!iomuxc_base) { + iounmap(weim_base); return -ENOMEM; + } /* CS1 timings for LAN9220 */ writel(0x20001, (weim_base + 0x18)); diff --git a/arch/arm/plat-mxc/include/mach/iomux-v1.h b/arch/arm/plat-mxc/include/mach/iomux-v1.h index 6fa8a707b9a..f7d18046c04 100644 --- a/arch/arm/plat-mxc/include/mach/iomux-v1.h +++ b/arch/arm/plat-mxc/include/mach/iomux-v1.h @@ -96,6 +96,6 @@ extern int mxc_gpio_mode(int gpio_mode); extern int mxc_gpio_setup_multiple_pins(const int *pin_list, unsigned count, const char *label); -extern int __init imx_iomuxv1_init(void __iomem *base, int numports); +extern int imx_iomuxv1_init(void __iomem *base, int numports); #endif /* __MACH_IOMUX_V1_H__ */ |