Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 26746
b: refs/heads/master
c: 478922c
h: refs/heads/master
v: v3
  • Loading branch information
Catalin Marinas authored and Russell King committed May 16, 2006
1 parent 96d04ca commit d37593f
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 1d6760a3ac6b5691e4914a3333b48fee5c2e275d
refs/heads/master: 478922c2b3c4ec8844ff2dec7eb1eba6f89a10ee
4 changes: 2 additions & 2 deletions trunk/arch/arm/mm/ioremap.c
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,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);
vunmap((void *)addr);
return NULL;
}
return (void __iomem *) (offset + (char *)addr);
Expand Down Expand Up @@ -173,7 +173,7 @@ EXPORT_SYMBOL(__ioremap);

void __iounmap(void __iomem *addr)
{
vfree((void *) (PAGE_MASK & (unsigned long) addr));
vunmap((void *)(PAGE_MASK & (unsigned long)addr));
}
EXPORT_SYMBOL(__iounmap);

Expand Down

0 comments on commit d37593f

Please sign in to comment.