[PATCH 2/8] bnx2x: clean up in case of error in bnx2x_init_hw()
From: Vladislav Zolotarov <hidden>
Date: 2010-02-17 12:12:55
Subsystem:
networking drivers, the rest · Maintainers:
Andrew Lunn, "David S. Miller", Eric Dumazet, Jakub Kicinski, Paolo Abeni, Linus Torvalds
Bug fix: clean up MCP state in case of error in bnx2x_init_hw(). Author: Dmitry Kravkov [off-list ref] Signed-off-by: Dmitry Kravkov <redacted> Signed-off-by: Vladislav Zolotarov <redacted> Signed-off-by: Eilon Greenstein <redacted> --- drivers/net/bnx2x_main.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/drivers/net/bnx2x_main.c b/drivers/net/bnx2x_main.c
index d7aef84..16685a1 100644
--- a/drivers/net/bnx2x_main.c
+++ b/drivers/net/bnx2x_main.c@@ -7530,6 +7530,9 @@ static int bnx2x_nic_load(struct bnx2x *bp, int load_mode) rc = bnx2x_init_hw(bp, load_code); if (rc) { BNX2X_ERR("HW init failed, aborting\n"); + bnx2x_fw_command(bp, DRV_MSG_CODE_LOAD_DONE); + bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_REQ_WOL_MCP); + bnx2x_fw_command(bp, DRV_MSG_CODE_UNLOAD_DONE); goto load_error2; }
--
1.6.3.3