Merge branch 'core-locking-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / net / ethernet / marvell / sky2.c

diff --git a/drivers/net/ethernet/marvell/sky2.c b/drivers/net/ethernet/marvell/sky2.c
index 339d841..43aa7ac 100644 (file)
--- a/drivers/net/ethernet/marvell/sky2.c
+++ b/drivers/net/ethernet/marvell/sky2.c
@@ -5084,7 +5084,6 @@ err_out_free_regions:
 err_out_disable:
        pci_disable_device(pdev);
 err_out:
-       pci_set_drvdata(pdev, NULL);
        return err;
 }
 
@@ -5127,8 +5126,6 @@ static void sky2_remove(struct pci_dev *pdev)
 
        iounmap(hw->regs);
        kfree(hw);
-
-       pci_set_drvdata(pdev, NULL);
 }
 
 static int sky2_suspend(struct device *dev)