| Message ID | 1312201870-12921-4-git-send-email-jamie@jamieiles.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
diff --git a/arch/arm/mach-ixp4xx/include/mach/io.h b/arch/arm/mach-ixp4xx/include/mach/io.h index 57b5410..99cd9ac 100644 --- a/arch/arm/mach-ixp4xx/include/mach/io.h +++ b/arch/arm/mach-ixp4xx/include/mach/io.h @@ -62,6 +62,9 @@ static inline int is_pci_memory(u32 addr) static inline void __iomem * __indirect_ioremap(unsigned long addr, size_t size, unsigned int mtype) { + if (!size) + return NULL; + if (!is_pci_memory(addr)) return __arm_ioremap(addr, size, mtype);
Without __arch_ioremap(), __get_vm_area_node() with a zero size will return a NULL pointer. Make the arch specific ioremap() do the same thing. Cc: Imre Kaloz <kaloz@openwrt.org> Cc: Krzysztof Halasa <khc@pm.waw.pl> Signed-off-by: Jamie Iles <jamie@jamieiles.com> --- arch/arm/mach-ixp4xx/include/mach/io.h | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)