diff options
author | David S. Miller <davem@davemloft.net> | 2010-07-13 14:20:58 -0700 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-07-13 14:20:58 -0700 |
commit | 1e2cfeef060fa0270f9a2d66b1218c12c05062e0 (patch) | |
tree | e5bea789f7d3523452dbef6b710bf53cc6c20c6f /drivers/net/tc35815.c | |
parent | 28bd620c7a1244e59459d6293ca11f162e0a67b9 (diff) | |
download | blackbird-op-linux-1e2cfeef060fa0270f9a2d66b1218c12c05062e0.tar.gz blackbird-op-linux-1e2cfeef060fa0270f9a2d66b1218c12c05062e0.zip |
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>
Diffstat (limited to 'drivers/net/tc35815.c')
-rw-r--r-- | drivers/net/tc35815.c | 4 |
1 files changed, 1 insertions, 3 deletions
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; |