diff options
| author | Vladislav Zolotarov <vladz@broadcom.com> | 2010-02-17 03:03:33 +0100 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-02-17 22:35:42 +0100 |
| commit | f1e1a199f3a68a32cf86095b3650d761ee8798b9 (patch) | |
| tree | 1f644d1a4b17d840b3179fd3c1ba4d8fa76d99b6 /drivers/net | |
| parent | bnx2x: Properly release allocated MSI-X/MSI vectors (diff) | |
| download | linux-f1e1a199f3a68a32cf86095b3650d761ee8798b9.tar.xz linux-f1e1a199f3a68a32cf86095b3650d761ee8798b9.zip | |
bnx2x: clean up in case of error in bnx2x_init_hw()
Bug fix: clean up MCP state in case of error in bnx2x_init_hw().
Author: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Dmitry Kravkov <dmitry@broadcom.com>
Signed-off-by: Vladislav Zolotarov <vladz@broadcom.com>
Signed-off-by: Eilon Greenstein <eilong@broadcom.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | 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 d7aef840a1d5..16685a153c10 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; } |