diff --git a/[refs] b/[refs]
index 94544bcf364e..b8b62fd91e73 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: acaf8276823302983d681c2cedaaf01918406935
+refs/heads/master: 20571d8894d1ee5a181e34e8d07ed8472acd30c4
diff --git a/trunk/drivers/net/ethernet/rdc/r6040.c b/trunk/drivers/net/ethernet/rdc/r6040.c
index f5e6f1f4f474..d1827e887f4e 100644
--- a/trunk/drivers/net/ethernet/rdc/r6040.c
+++ b/trunk/drivers/net/ethernet/rdc/r6040.c
@@ -1233,6 +1233,8 @@ static int __devinit r6040_init_one(struct pci_dev *pdev,
 err_out_mdio:
 	mdiobus_free(lp->mii_bus);
 err_out_unmap:
+	netif_napi_del(&lp->napi);
+	pci_set_drvdata(pdev, NULL);
 	pci_iounmap(pdev, ioaddr);
 err_out_free_res:
 	pci_release_regions(pdev);
@@ -1253,6 +1255,9 @@ static void __devexit r6040_remove_one(struct pci_dev *pdev)
 	mdiobus_unregister(lp->mii_bus);
 	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);
 	pci_disable_device(pdev);