diff options
| author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-08-23 08:35:10 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-08-23 19:00:22 -0700 |
| commit | 1dbc84a7f6c2ebd8c69299e1adef22ee26db38c0 (patch) | |
| tree | e46a7a771da5666dab3772831a5712a42e293bad /drivers/net/netxen/netxen_nic_main.c | |
| parent | 1bb482f8a46000f77577948ff1c350275bba7dc9 (diff) | |
| download | blackbird-op-linux-1dbc84a7f6c2ebd8c69299e1adef22ee26db38c0.tar.gz blackbird-op-linux-1dbc84a7f6c2ebd8c69299e1adef22ee26db38c0.zip | |
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: Dhananjay Phadke <dhananjay@netxen.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net/netxen/netxen_nic_main.c')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c index de67e42a2971..008657423f8e 100644 --- a/drivers/net/netxen/netxen_nic_main.c +++ b/drivers/net/netxen/netxen_nic_main.c @@ -754,8 +754,10 @@ netxen_start_firmware(struct netxen_adapter *adapter, int request_fw) netxen_request_firmware(adapter); err = netxen_need_fw_reset(adapter); - if (err <= 0) + if (err < 0) return err; + if (err == 0) + goto wait_init; if (first_boot != 0x55555555) { NXWR32(adapter, CRB_CMDPEG_STATE, 0); |
