summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDhananjay Phadke <dhananjay@netxen.com>2009-09-20 19:20:39 (GMT)
committerDavid S. Miller <davem@davemloft.net>2009-09-22 21:00:02 (GMT)
commit07653aa3afe7b74cbddfe3bca82a898c413855b1 (patch)
tree0d4834742f1e924ec12a74af6090e026306f4c33
parenta598ae177a11ebae065e20059d9bc63a5da4ccc3 (diff)
downloadlinux-fsl-qoriq-07653aa3afe7b74cbddfe3bca82a898c413855b1.tar.xz
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>
-rw-r--r--drivers/net/netxen/netxen_nic_main.c1
1 files changed, 1 insertions, 0 deletions
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);