From 389a2d7fa6d6b8bc2df9b2545c006f7a313e4d2d Mon Sep 17 00:00:00 2001
From: Kulikov Vasiliy <segooon@gmail.com>
Date: Sat, 10 Jul 2010 00:03:18 +0000
Subject: [PATCH] --- yaml --- r: 203471 b: refs/heads/master c:
 b31fb86815153be3bc94e8ffb9dbf6e9d7694b2d h: refs/heads/master i:   203469:
 d0ffe45636229dc3d4e79128daa52e143256a7e9   203467:
 a6bb3a2454b85ad935a91f284582e39d3159236d   203463:
 5c763fe959261fb1d18d6b309e729f590c46e238   203455:
 84cd84a38cb7961d7778694bec97c6bb3e75dfbd v: v3

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

diff --git a/[refs] b/[refs]
index de3c5c4f10ee..89da756b9b82 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 60eb5fd11d1c6050c45a5aab141f42dd396e2a7f
+refs/heads/master: b31fb86815153be3bc94e8ffb9dbf6e9d7694b2d
diff --git a/trunk/drivers/net/tc35815.c b/trunk/drivers/net/tc35815.c
index be08b75dbc15..99afa5c47bec 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;
+		goto err_out_iounmap;
 
 	memcpy(dev->perm_addr, dev->dev_addr, dev->addr_len);
 	printk(KERN_INFO "%s: %s at 0x%lx, %pM, IRQ %d\n",
@@ -872,6 +872,8 @@ 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;