Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 195835
b: refs/heads/master
c: 440d4f9
h: refs/heads/master
i:
  195833: 6f8bdd6
  195831: 19c5107
v: v3
  • Loading branch information
H Hartley Sweeten authored and David Woodhouse committed Dec 31, 2009
1 parent 21344f2 commit eb400cc
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 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: 34970a7db5c73f4c83b72ce989d297a95efb3a6d
refs/heads/master: 440d4f9fb62dad0d5ed1635d099cedaa7a25d96d
6 changes: 3 additions & 3 deletions trunk/drivers/mtd/nand/au1550nd.c
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ static int __init au1xxx_nand_init(void)
}
nand_phys = (mem_staddr << 4) & 0xFFFC0000;

p_nand = (void __iomem *)ioremap(nand_phys, 0x1000);
p_nand = ioremap(nand_phys, 0x1000);

/* make controller and MTD agree */
if (NAND_CS == 0)
Expand Down Expand Up @@ -583,7 +583,7 @@ static int __init au1xxx_nand_init(void)
return 0;

outio:
iounmap((void *)p_nand);
iounmap(p_nand);

outmem:
kfree(au1550_mtd);
Expand All @@ -604,7 +604,7 @@ static void __exit au1550_cleanup(void)
kfree(au1550_mtd);

/* Unmap */
iounmap((void *)p_nand);
iounmap(p_nand);
}

module_exit(au1550_cleanup);
Expand Down

0 comments on commit eb400cc

Please sign in to comment.