From: Tony Lindgren Date: Tue, 7 Feb 2006 03:37:25 +0000 (-0800) Subject: Manually merged arch/arm/mm/ioremap.c X-Git-Tag: v2.6.16-omap1~107 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=1eceaa1781449567248f0faa1c4a471eed7aaafb;p=linux-2.6-omap-h63xx.git Manually merged arch/arm/mm/ioremap.c --- diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index c45bfeaf41a..da9b3597411 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -142,7 +142,7 @@ __ioremap_pfn(unsigned long pfn, unsigned long offset, size_t size, return NULL; addr = (unsigned long)area->addr; if (remap_area_pages(addr, pfn, size, flags)) { - vfree((void *)addr); + vfree((void *)addr); return NULL; } return (void __iomem *) (offset + (char *)addr);