From: Devendra Naga <devendra.aaru@gmail.com>
Date: Fri, 6 Jul 2012 20:07:35 +0000 (+0000)
Subject: r6040: remove duplicate call to the pci_set_drvdata
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=8ce5c9f27d2e2ce415d903d916e848a356d4c0c0;p=deliverable%2Flinux.git

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>
---

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);