1 files changed, 3 insertions, 1 deletions

diff --git a/drivers/net/ethernet/realtek/8139too.c b/drivers/net/ethernet/realtek/8139too.c
index 6d0b9dfac313..78bb4ceb1cdd 100644
--- a/drivers/net/ethernet/realtek/8139too.c
+++ b/drivers/net/ethernet/realtek/8139too.c
@@ -787,10 +787,10 @@ static struct net_device *rtl8139_init_board(struct pci_dev *pdev)
         if (rc)
                 goto err_out;
 
+        disable_dev_on_err = 1;
         rc = pci_request_regions (pdev, DRV_NAME);
         if (rc)
                 goto err_out;
-        disable_dev_on_err = 1;
 
         pci_set_master (pdev);
 
@@ -1110,6 +1110,7 @@ static int rtl8139_init_one(struct pci_dev *pdev,
         return 0;
 
 err_out:
+        netif_napi_del(&tp->napi);
         __rtl8139_cleanup_dev (dev);
         pci_disable_device (pdev);
         return i;
@@ -1124,6 +1125,7 @@ static void rtl8139_remove_one(struct pci_dev *pdev)
         assert (dev != NULL);
 
         cancel_delayed_work_sync(&tp->thread);
+        netif_napi_del(&tp->napi);
 
         unregister_netdev (dev);