diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-31 15:49:28 -0500 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2006-01-31 15:49:28 -0500 |
| commit | 638e174688f58200d0deb7435093435e7d737b09 (patch) | |
| tree | a2cd32dbb41daf0a5d4e69eff1805fd5574c292a /arch/arm/mm/ioremap.c | |
| parent | 8d58d773b745950ac912e028b3c81f4902fbf91d (diff) | |
| parent | d195ea4b1456192abe780fd773778cbe9f6d77ea (diff) | |
Merge branch 'origin'
Diffstat (limited to 'arch/arm/mm/ioremap.c')
| -rw-r--r-- | arch/arm/mm/ioremap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index de3ce1eec2ec..da9b35974118 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, | |||
| 142 | return NULL; | 142 | return NULL; |
| 143 | addr = (unsigned long)area->addr; | 143 | addr = (unsigned long)area->addr; |
| 144 | if (remap_area_pages(addr, pfn, size, flags)) { | 144 | if (remap_area_pages(addr, pfn, size, flags)) { |
| 145 | vfree(addr); | 145 | vfree((void *)addr); |
| 146 | return NULL; | 146 | return NULL; |
| 147 | } | 147 | } |
| 148 | return (void __iomem *) (offset + (char *)addr); | 148 | return (void __iomem *) (offset + (char *)addr); |