Commit 1dbc84a7 authored by Dhananjay Phadke's avatar Dhananjay Phadke Committed by David S. Miller

netxen: fix firmware reset logic

If netxen_need_fw_reset() return 0 [ implies firmware is up
and running], still go through dma mask check, etc.
Signed-off-by: default avatarDhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 1bb482f8
...@@ -754,8 +754,10 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw) ...@@ -754,8 +754,10 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw)
netxen_request_firmware(adapter); netxen_request_firmware(adapter);
err = netxen_need_fw_reset(adapter); err = netxen_need_fw_reset(adapter);
if (err <= 0) if (err < 0)
return err; return err;
if (err == 0)
goto wait_init;
if (first_boot != 0x55555555) { if (first_boot != 0x55555555) {
NXWR32(adapter, CRB_CMDPEG_STATE, 0); NXWR32(adapter, CRB_CMDPEG_STATE, 0);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment