aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorDevendra Naga <devendra.aaru@gmail.com>2012-07-06 20:07:35 +0000
committerDavid S. Miller <davem@davemloft.net>2012-07-07 16:16:12 -0700
commit8ce5c9f27d2e2ce415d903d916e848a356d4c0c0 (patch)
tree31ac05c7c4c5147465d4f3b401549982c483bf03 /drivers
parentipv6: fix a bad cast in ip6_dst_lookup_tail() (diff)
downloadlinux-dev-8ce5c9f27d2e2ce415d903d916e848a356d4c0c0.tar.xz
linux-dev-8ce5c9f27d2e2ce415d903d916e848a356d4c0c0.zip
r6040: remove duplicate call to the pci_set_drvdata
pci_set_drvdata is called twice at the remove path of driver, call it once. Signed-off-by: Devendra Naga <devendra.aaru@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/net/ethernet/rdc/r6040.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index d1827e887f4e..9acc026f62e8 100644
--- a/drivers/net/ethernet/rdc/r6040.c
+++ b/drivers/net/ethernet/rdc/r6040.c
@@ -1256,7 +1256,6 @@ static void __devexit r6040_remove_one(struct pci_dev *pdev)
kfree(lp->mii_bus->irq);
mdiobus_free(lp->mii_bus);
netif_napi_del(&lp->napi);
- pci_set_drvdata(pdev, NULL);
pci_iounmap(pdev, lp->base);
pci_release_regions(pdev);
free_netdev(dev);