Merge tag 'md/3.13' of git://neil.brown.name/md

[~andy/linux] / drivers / net / ethernet / jme.c

diff --git a/drivers/net/ethernet/jme.c b/drivers/net/ethernet/jme.c
index b56d2a29cd0ed6ea5a062e477de525791ae1489d..f5685c0d057911c6c2f59dd982f21f869d1b978c 100644 (file)
--- a/drivers/net/ethernet/jme.c
+++ b/drivers/net/ethernet/jme.c
@@ -3192,7 +3192,6 @@ jme_init_one(struct pci_dev *pdev,
 err_out_unmap:
        iounmap(jme->regs);
 err_out_free_netdev:
-       pci_set_drvdata(pdev, NULL);
        free_netdev(netdev);
 err_out_release_regions:
        pci_release_regions(pdev);
@@ -3210,7 +3209,6 @@ jme_remove_one(struct pci_dev *pdev)
 
        unregister_netdev(netdev);
        iounmap(jme->regs);
-       pci_set_drvdata(pdev, NULL);
        free_netdev(netdev);
        pci_release_regions(pdev);
        pci_disable_device(pdev);