From: Dhananjay Phadke <dhananjay@netxen.com>
Date: Sun, 20 Sep 2009 19:20:39 +0000 (+0000)
Subject: netxen: fix firmware init after resume
X-Git-Tag: v2.6.32-rc1~21^2~34
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=07653aa3afe7b74cbddfe3bca82a898c413855b1;p=profile%2Fivi%2Fkernel-adaptation-intel-automotive.git

netxen: fix firmware init after resume

After successful firmware init, return instead of
falling to error path (leading to detach) after
resuming to D0 state. This was broken in recent
firmware reset rehaul.

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 b8c7235..b5aa974 100644
--- a/drivers/net/netxen/netxen_nic_main.c
+++ b/drivers/net/netxen/netxen_nic_main.c
@@ -1469,6 +1469,7 @@ netxen_nic_resume(struct pci_dev *pdev)
 	}
 
 	netxen_schedule_work(adapter, netxen_fw_poll_work, FW_POLL_DELAY);
+	return 0;
 
 err_out_detach:
 	netxen_nic_detach(adapter);