diff options
| author |   Sony Chacko <sony.chacko@qlogic.com> | 2010-08-31 17:17:44 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2010-09-01 10:41:53 -0700 |
| commit | 4e70812b3dc32c76fa2fa3aa2c8221eaac87cd6f (patch) | |
| tree | 3fcbb778ec0d67bebcf27c3215625e6f6021ed05 /drivers/net/qlcnic/qlcnic_main.c | |
| parent | stmmac: Fix another build warning. (diff) | |
| download | linux-dev-4e70812b3dc32c76fa2fa3aa2c8221eaac87cd6f.tar.xz linux-dev-4e70812b3dc32c76fa2fa3aa2c8221eaac87cd6f.zip | |
qlcnic: backout firmware initialization update
o Backing out "firmware initialization update" changes, commit-id
"d4066833bb1b35fefb1dd45eb2b10659d46bf151".
o fix heartbit spelling, it should be heartbeat
Signed-off-by: Sony Chacko <sony.chacko@qlogic.com>
Signed-off-by: Amit Kumar Salecha <amit.salecha@qlogic.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/qlcnic/qlcnic_main.c')
| -rw-r--r-- | drivers/net/qlcnic/qlcnic_main.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/drivers/net/qlcnic/qlcnic_main.c b/drivers/net/qlcnic/qlcnic_main.c index 6999d5aaa157..771a160b88c1 100644 --- a/drivers/net/qlcnic/qlcnic_main.c +++ b/drivers/net/qlcnic/qlcnic_main.c @@ -983,7 +983,7 @@ qlcnic_start_firmware(struct qlcnic_adapter *adapter) err = qlcnic_need_fw_reset(adapter); if (err == 0) - goto set_dev_ready; + goto check_fw_status; err = qlcnic_pinit_from_rom(adapter); if (err) @@ -1002,7 +1002,6 @@ check_fw_status: if (err) goto err_out; -set_dev_ready: QLCWR32(adapter, QLCNIC_CRB_DEV_STATE, QLCNIC_DEV_READY); qlcnic_idc_debug_info(adapter, 1); @@ -2795,7 +2794,7 @@ done: static int qlcnic_check_health(struct qlcnic_adapter *adapter) { - u32 state = 0, heartbit; + u32 state = 0, heartbeat; struct net_device *netdev = adapter->netdev; if (qlcnic_check_temp(adapter)) @@ -2811,9 +2810,9 @@ qlcnic_check_health(struct qlcnic_adapter *adapter) adapter->need_fw_reset = 1; } - heartbit = QLCRD32(adapter, QLCNIC_PEG_ALIVE_COUNTER); - if (heartbit != adapter->heartbit) { - adapter->heartbit = heartbit; + heartbeat = QLCRD32(adapter, QLCNIC_PEG_ALIVE_COUNTER); + if (heartbeat != adapter->heartbeat) { + adapter->heartbeat = heartbeat; adapter->fw_fail_cnt = 0; if (adapter->need_fw_reset) goto detach; |