2 files changed, 9 insertions, 0 deletions

diff --git a/drivers/net/bnx2x.h b/drivers/net/bnx2x.h
index 004f4a8e1649..633acca4a988 100644
--- a/drivers/net/bnx2x.h
+++ b/drivers/net/bnx2x.h
@@ -89,6 +89,7 @@
         } while (0)
 #else
 #define bnx2x_panic() do { \
+                bp->panic = 1; \
                 BNX2X_ERR("driver assert\n"); \
                 bnx2x_panic_dump(bp); \
         } while (0)
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index 8e77e933ac18..c289670a55af 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c
@@ -7109,6 +7109,9 @@ static int bnx2x_wait_ramrod(struct bnx2x *bp, int state, int idx,
                 }
 
                 msleep(1);
+
+                if (bp->panic)
+                        return -EIO;
         }
 
         /* timeout! */
@@ -7373,7 +7376,12 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode)
         rc = bnx2x_setup_leading(bp);
         if (rc) {
                 BNX2X_ERR("Setup leading failed!\n");
+#ifndef BNX2X_STOP_ON_ERROR
                 goto load_error3;
+#else
+                bp->panic = 1;
+                return -EBUSY;
+#endif
         }
 
         if (CHIP_IS_E1H(bp))