Merge remote-tracking branch 'net-next/master'

[karo-tx-linux.git] / drivers / net / ethernet / dec / tulip / dmfe.c

diff --git a/drivers/net/ethernet/dec/tulip/dmfe.c b/drivers/net/ethernet/dec/tulip/dmfe.c
index 83139307861cd720edfd78d71d7abbe6b2265ff5..5ad9e3e3c0b8a5095564ae4c4369c3ac531c9591 100644 (file)
--- a/drivers/net/ethernet/dec/tulip/dmfe.c
+++ b/drivers/net/ethernet/dec/tulip/dmfe.c
@@ -523,7 +523,6 @@ err_out_res:
 err_out_disable:
        pci_disable_device(pdev);
 err_out_free:
-       pci_set_drvdata(pdev, NULL);
        free_netdev(dev);
 
        return err;
@@ -548,8 +547,6 @@ static void dmfe_remove_one(struct pci_dev *pdev)
                                        db->buf_pool_ptr, db->buf_pool_dma_ptr);
                pci_release_regions(pdev);
                free_netdev(dev);       /* free board information */
-
-               pci_set_drvdata(pdev, NULL);
        }
 
        DMFE_DBUG(0, "dmfe_remove_one() exit", 0);