From 1eceaa1781449567248f0faa1c4a471eed7aaafb Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Mon, 6 Feb 2006 19:37:25 -0800 Subject: [PATCH] Manually merged arch/arm/mm/ioremap.c --- arch/arm/mm/ioremap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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); -- 2.41.1