Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 284338
b: refs/heads/master
c: 20d4369
h: refs/heads/master
v: v3
  • Loading branch information
Julia Lawall authored and David S. Miller committed Jan 13, 2012
1 parent 26fc590 commit e9de48b
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 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: 83636580ad99cffd85b07e75da7ad45ada0fd530
refs/heads/master: 20d4369b6892159895d6136946e692eaf29e8413
6 changes: 4 additions & 2 deletions trunk/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 e9de48b

Please sign in to comment.