From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Sun, 23 Aug 2009 08:35:10 +0000 (+0000)
Subject: netxen: fix firmware reset logic
X-Git-Tag: upstream/snapshot3+hdmi~17671^2~325
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1dbc84a7f6c2ebd8c69299e1adef22ee26db38c0;p=platform%2Fadaptation%2Frenesas_rcar%2Frenesas_kernel.git

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>
---

diff --git a/drivers/net/netxen/netxen_nic_main.c b/drivers/net/netxen/netxen_nic_main.c
index de67e42..0086574 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);