From: David S. Miller <davem@davemloft.net>
Date: Tue, 13 Jul 2010 21:20:58 +0000 (-0700)
Subject: Revert "tc35815: fix iomap leak"
X-Git-Tag: MMI-PSA29.97-13-9~23092^2~241
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1e2cfeef060fa0270f9a2d66b1218c12c05062e0;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Revert "tc35815: fix iomap leak"

This reverts commit b31fb86815153be3bc94e8ffb9dbf6e9d7694b2d.

pcim_*() managed drivers do not need explicit resource
releasing like this.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/tc35815.c b/drivers/net/tc35815.c
index 99afa5c47bec..be08b75dbc15 100644
--- a/drivers/net/tc35815.c
+++ b/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;