Skip to content

Commit

Permalink
arch/powerpc/sysdev/fsl_pci.c: add missing iounmap
Browse files Browse the repository at this point in the history
Add missing iounmap in error handling code, in a case where the function
already preforms iounmap on some other execution path.

A simplified version of the semantic match that finds this problem is as
follows: (http://coccinelle.lip6.fr/)

// <smpl>
@@
expression e;
statement S,S1;
int ret;
@@
e = \(ioremap\|ioremap_nocache\)(...)
... when != iounmap(e)
if (<+...e...+>) S
... when any
    when != iounmap(e)
*if (...)
   { ... when != iounmap(e)
     return ...; }
... when any
iounmap(e);
// </smpl>

Signed-off-by: Julia Lawall <Julia.Lawall@lip6.fr>
Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
  • Loading branch information
Julia Lawall authored and Kumar Gala committed Jan 17, 2012
1 parent ba8438f commit 0cf572d
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions arch/powerpc/sysdev/fsl_pci.c
Original file line number Diff line number Diff line change
Expand Up @@ -205,12 +205,12 @@ static void __init setup_pci_atmu(struct pci_controller *hose,

if (paddr_hi == paddr_lo) {
pr_err("%s: No outbound window space\n", name);
return ;
goto out;
}

if (paddr_lo == 0) {
pr_err("%s: No space for inbound window\n", name);
return ;
goto out;
}

/* setup PCSRBAR/PEXCSRBAR */
Expand Down Expand Up @@ -357,6 +357,7 @@ static void __init setup_pci_atmu(struct pci_controller *hose,
(u64)hose->dma_window_size);
}

out:
iounmap(pci);
}

Expand Down

0 comments on commit 0cf572d

Please sign in to comment.