diff options
| author |   Julia Lawall <Julia.Lawall@lip6.fr> | 2012-01-11 23:55:04 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2012-01-12 20:05:28 -0800 |
| commit | 20d4369b6892159895d6136946e692eaf29e8413 (patch) | |
| tree | cd23450e46a9ec31c794c39126049a5d2b2ee988 /drivers/net/ethernet/tundra | |
| parent | ksz884x: fix mtu for VLAN (diff) | |
| download | linux-dev-20d4369b6892159895d6136946e692eaf29e8413.tar.xz linux-dev-20d4369b6892159895d6136946e692eaf29e8413.zip | |
drivers/net/ethernet/tundra/tsi108_eth.c: add missing iounmap
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>
Diffstat (limited to 'drivers/net/ethernet/tundra')
| -rw-r--r-- | drivers/net/ethernet/tundra/tsi108_eth.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/net/ethernet/tundra/tsi108_eth.c b/drivers/net/ethernet/tundra/tsi108_eth.c index a9ce01bafd20..164fb775d7b3 100644 --- a/drivers/net/ethernet/tundra/tsi108_eth.c +++ b/drivers/net/ethernet/tundra/tsi108_eth.c @@ -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; @@ -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; |