1 files changed, 7 insertions, 2 deletions

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 9cfd46017e4e..1d502e6f6c9c 100644
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -6992,9 +6992,14 @@ bnx2_change_ring_size(struct bnx2 *bp, u32 rx, u32 tx)
                 int rc;
 
                 rc = bnx2_alloc_mem(bp);
-                if (rc)
+                if (!rc)
+                        rc = bnx2_init_nic(bp, 0);
+
+                if (rc) {
+                        bnx2_napi_enable(bp);
+                        dev_close(bp->dev);
                         return rc;
-                bnx2_init_nic(bp, 0);
+                }
                 bnx2_netif_start(bp);
         }
         return 0;