diff options
| author | Dhananjay Phadke <dhananjay@netxen.com> | 2009-09-20 19:20:39 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-09-22 14:00:02 -0700 |
| commit | 07653aa3afe7b74cbddfe3bca82a898c413855b1 (patch) | |
| tree | 0d4834742f1e924ec12a74af6090e026306f4c33 /drivers/net/netxen | |
| parent | a598ae177a11ebae065e20059d9bc63a5da4ccc3 (diff) | |
| download | kernel_samsung_smdk4412-07653aa3afe7b74cbddfe3bca82a898c413855b1.zip kernel_samsung_smdk4412-07653aa3afe7b74cbddfe3bca82a898c413855b1.tar.gz kernel_samsung_smdk4412-07653aa3afe7b74cbddfe3bca82a898c413855b1.tar.bz2 | |
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>
Diffstat (limited to 'drivers/net/netxen')
| -rw-r--r-- | drivers/net/netxen/netxen_nic_main.c | 1 |
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); |