From e9de48be893e0e7e5ea57cb42c5d609d22ded39c Mon Sep 17 00:00:00 2001
From: Julia Lawall <Julia.Lawall@lip6.fr>
Date: Wed, 11 Jan 2012 23:55:04 +0000
Subject: [PATCH] --- yaml --- r: 284338 b: refs/heads/master c:
 20d4369b6892159895d6136946e692eaf29e8413 h: refs/heads/master v: v3

---
 [refs]                                         | 2 +-
 trunk/drivers/net/ethernet/tundra/tsi108_eth.c | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 023535dfb1b3..77f50e5c95bc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 83636580ad99cffd85b07e75da7ad45ada0fd530
+refs/heads/master: 20d4369b6892159895d6136946e692eaf29e8413
diff --git a/trunk/drivers/net/ethernet/tundra/tsi108_eth.c b/trunk/drivers/net/ethernet/tundra/tsi108_eth.c
index a9ce01bafd20..164fb775d7b3 100644
--- a/trunk/drivers/net/ethernet/tundra/tsi108_eth.c
+++ b/trunk/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;