From 70bbe422a0fd3349a51c93110409b1855208634e Mon Sep 17 00:00:00 2001 From: Sritej Velaga Date: Fri, 3 Feb 2012 13:45:43 +0000 Subject: [PATCH] --- yaml --- r: 289868 b: refs/heads/master c: 97048a1f2b2f0ca2b2f690b551d5e97eeb94a0e9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 948e56dc399b..bd378219b182 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 476a4b6d2543f0d9fa5205e0c25ebcd7973337bd +refs/heads/master: 97048a1f2b2f0ca2b2f690b551d5e97eeb94a0e9 diff --git a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c index a47c70b09342..dba95311a462 100644 --- a/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c +++ b/trunk/drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c @@ -3159,7 +3159,7 @@ qlcnic_check_health(struct qlcnic_adapter *adapter) QLCRD32(adapter, QLCNIC_CRB_PEG_NET_3 + 0x3c), QLCRD32(adapter, QLCNIC_CRB_PEG_NET_4 + 0x3c)); peg_status = QLCRD32(adapter, QLCNIC_PEG_HALT_STATUS1); - if (LSW(MSB(peg_status)) == 0x67) + if (QLCNIC_FWERROR_CODE(peg_status) == 0x67) dev_err(&adapter->pdev->dev, "Firmware aborted with error code 0x00006700. " "Device is being reset.\n");