drivers/pcmcia: Add missing iounmap
of_iomap calls ioremap, and so should be matched with an iounmap. At the two error returns, the result of calling of_iomap is only stored in a local variable, so these error paths need to call iounmap. Furthermore, this function ultimately stores the result of of_iomap in an array that is local to the file. These values should be iounmapped at some point. I have added a corresponding call to iounmap at the end of the function m8xx_remove. The problem was found using the following semantic match. (http://www.emn.fr/x-info/coccinelle/) // <smpl> @@ type T,T1,T2; identifier E; statement S; expression x1,x2,x3; int ret; @@ T E; ... * E = of_iomap(...); if (E == NULL) S ... when != iounmap(...,(T1)E,...) when != if (E != NULL) { ... iounmap(...,(T1)E,...); ...} when != x1 = (T1)E when != E = x3; when any if (...) { ... when != iounmap(...,(T2)E,...) when != if (E != NULL) { ... iounmap(...,(T2)E,...); ...} when != x2 = (T2)E ( * return; | * return ret; ) } // </smpl> Signed-off-by: Julia Lawall <julia@diku.dk> Vitaly Bordug <vitb@kernel.crashing.org> Cc: Arnd Bergmann <arnd@arndb.de> Cc: Olof Johansson <olof@lixom.net> Cc: Dominik Brodowski <linux@dominikbrodowski.net> Cc: Paul Mackerras <paulus@samba.org> Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org> Cc: Kumar Gala <galak@kernel.crashing.org> Cc: Stephen Rothwell <sfr@canb.auug.org.au> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
4c1fc445c2
commit
5a1c3e1aa9
|
@ -1174,8 +1174,10 @@ static int __init m8xx_probe(struct of_device *ofdev,
|
|||
|
||||
pcmcia_schlvl = irq_of_parse_and_map(np, 0);
|
||||
hwirq = irq_map[pcmcia_schlvl].hwirq;
|
||||
if (pcmcia_schlvl < 0)
|
||||
if (pcmcia_schlvl < 0) {
|
||||
iounmap(pcmcia);
|
||||
return -EINVAL;
|
||||
}
|
||||
|
||||
m8xx_pgcrx[0] = &pcmcia->pcmc_pgcra;
|
||||
m8xx_pgcrx[1] = &pcmcia->pcmc_pgcrb;
|
||||
|
@ -1189,6 +1191,7 @@ static int __init m8xx_probe(struct of_device *ofdev,
|
|||
driver_name, socket)) {
|
||||
pcmcia_error("Cannot allocate IRQ %u for SCHLVL!\n",
|
||||
pcmcia_schlvl);
|
||||
iounmap(pcmcia);
|
||||
return -1;
|
||||
}
|
||||
|
||||
|
@ -1284,6 +1287,7 @@ static int m8xx_remove(struct of_device *ofdev)
|
|||
}
|
||||
for (i = 0; i < PCMCIA_SOCKETS_NO; i++)
|
||||
pcmcia_unregister_socket(&socket[i].socket);
|
||||
iounmap(pcmcia);
|
||||
|
||||
free_irq(pcmcia_schlvl, NULL);
|
||||
|
||||
|
|
Loading…
Reference in New Issue