diff mbox

r6040: remove duplicate call to the pci_set_drvdata

Message ID 1341641255-26429-1-git-send-email-devendra.aaru@gmail.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Devendra Naga July 7, 2012, 6:07 a.m. UTC
pci_set_drvdata is called twice at the remove path of driver,
call it once.

Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>
---
 drivers/net/ethernet/rdc/r6040.c |    1 -
 1 file changed, 1 deletion(-)

Comments

David Miller July 7, 2012, 11:16 p.m. UTC | #1
From: Devendra Naga <devendra.aaru@gmail.com>
Date: Sat,  7 Jul 2012 11:37:35 +0530

> pci_set_drvdata is called twice at the remove path of driver,
> call it once.
> 
> Signed-off-by: Devendra Naga <devendra.aaru@gmail.com>

Applied, thanks.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/drivers/net/ethernet/rdc/r6040.c b/drivers/net/ethernet/rdc/r6040.c
index d1827e8..9acc026 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);