1 files changed, 6 insertions, 6 deletions

diff --git a/drivers/net/ethernet/broadcom/bgmac.c b/drivers/net/ethernet/broadcom/bgmac.c
index 05c6af6c418f..3007d95fbb9f 100644
--- a/drivers/net/ethernet/broadcom/bgmac.c
+++ b/drivers/net/ethernet/broadcom/bgmac.c
@@ -1167,10 +1167,10 @@ static int bgmac_poll(struct napi_struct *napi, int weight)
                 bgmac->int_status = 0;
         }
 
-        if (handled < weight)
+        if (handled < weight) {
                 napi_complete(napi);
-
-        bgmac_chip_intrs_on(bgmac);
+                bgmac_chip_intrs_on(bgmac);
+        }
 
         return handled;
 }
@@ -1515,6 +1515,8 @@ static int bgmac_probe(struct bcma_device *core)
         if (core->bus->sprom.boardflags_lo & BGMAC_BFL_ENETADM)
                 bgmac_warn(bgmac, "Support for ADMtek ethernet switch not implemented\n");
 
+        netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);
+
         err = bgmac_mii_register(bgmac);
         if (err) {
                 bgmac_err(bgmac, "Cannot register MDIO\n");
@@ -1529,8 +1531,6 @@ static int bgmac_probe(struct bcma_device *core)
 
         netif_carrier_off(net_dev);
 
-        netif_napi_add(net_dev, &bgmac->napi, bgmac_poll, BGMAC_WEIGHT);
-
         return 0;
 
 err_mii_unregister:
@@ -1549,9 +1549,9 @@ static void bgmac_remove(struct bcma_device *core)
 {
         struct bgmac *bgmac = bcma_get_drvdata(core);
 
-        netif_napi_del(&bgmac->napi);
         unregister_netdev(bgmac->net_dev);
         bgmac_mii_unregister(bgmac);
+        netif_napi_del(&bgmac->napi);
         bgmac_dma_free(bgmac);
         bcma_set_drvdata(core, NULL);
         free_netdev(bgmac->net_dev);