Skip to content

Commit

Permalink
drivers/net/ethernet/tundra/tsi108_eth.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: David S. Miller <davem@davemloft.net>
  • Loading branch information
Julia Lawall authored and David S. Miller committed Jan 13, 2012
1 parent 8363658 commit 20d4369
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions drivers/net/ethernet/tundra/tsi108_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -1604,7 +1604,7 @@ tsi108_init_one(struct platform_device *pdev)
data->phyregs = ioremap(einfo->phyregs, 0x400);
if (NULL == data->phyregs) {
err = -ENOMEM;
goto regs_fail;
goto phyregs_fail;
}
/* MII setup */
data->mii_if.dev = dev;
Expand Down Expand Up @@ -1663,9 +1663,11 @@ tsi108_init_one(struct platform_device *pdev)
return 0;

register_fail:
iounmap(data->regs);
iounmap(data->phyregs);

phyregs_fail:
iounmap(data->regs);

regs_fail:
free_netdev(dev);
return err;
Expand Down

0 comments on commit 20d4369

Please sign in to comment.