From 9b8b4997b4f7b3f85397d8c797bf4eb82eb9ca7d Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Tue, 13 Jul 2010 14:20:58 -0700
Subject: [PATCH] --- yaml --- r: 203490 b: refs/heads/master c:
 1e2cfeef060fa0270f9a2d66b1218c12c05062e0 h: refs/heads/master v: v3

---
 [refs]                      | 2 +-
 trunk/drivers/net/tc35815.c | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index a8daf70e5164..b96ea9f2ef2d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 28bd620c7a1244e59459d6293ca11f162e0a67b9
+refs/heads/master: 1e2cfeef060fa0270f9a2d66b1218c12c05062e0
diff --git a/trunk/drivers/net/tc35815.c b/trunk/drivers/net/tc35815.c
index 99afa5c47bec..be08b75dbc15 100644
--- a/trunk/drivers/net/tc35815.c
+++ b/trunk/drivers/net/tc35815.c
@@ -854,7 +854,7 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
 
 	rc = register_netdev(dev);
 	if (rc)
-		goto err_out_iounmap;
+		goto err_out;
 
 	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 	printk(KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n",
@@ -872,8 +872,6 @@ static int __devinit tc35815_init_one(struct pci_dev *pdev,
 
 err_out_unregister:
 	unregister_netdev(dev);
-err_out_iounmap:
-	pcim_iounmap_regions(pdev, 1 << 1);
 err_out:
 	free_netdev(dev);
 	return rc;