]> git.karo-electronics.de Git - linux-beck.git/commitdiff
r6040: remove duplicate call to the pci_set_drvdata
authorDevendra Naga <devendra.aaru@gmail.com>
Fri, 6 Jul 2012 20:07:35 +0000 (20:07 +0000)
committerDavid S. Miller <davem@davemloft.net>
Sat, 7 Jul 2012 23:16:12 +0000 (16:16 -0700)
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>
drivers/net/ethernet/rdc/r6040.c

index d1827e887f4e9d82ce8d46ee33cfb61052ee2816..9acc026f62e8093468c56150a0233133c70741d2 100644 (file)
@@ -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);