aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/net/atlx
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2008-11-20 16:44:00 -0800
committerDavid S. Miller <davem@davemloft.net>2008-11-20 16:44:00 -0800
commit6ab33d51713d6d60c7677c0d020910a8cb37e513 (patch)
tree546c2ff099b2757e75cf34ddace874f1220f740e /drivers/net/atlx
parent7be6065b39c3f1cfa796667eac1a2170465acc91 (diff)
parent13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff)
downloadkernel_samsung_smdk4412-6ab33d51713d6d60c7677c0d020910a8cb37e513.zip
kernel_samsung_smdk4412-6ab33d51713d6d60c7677c0d020910a8cb37e513.tar.gz
kernel_samsung_smdk4412-6ab33d51713d6d60c7677c0d020910a8cb37e513.tar.bz2
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts: drivers/net/ixgbe/ixgbe_main.c include/net/mac80211.h net/phonet/af_phonet.c
Diffstat (limited to 'drivers/net/atlx')
-rw-r--r--drivers/net/atlx/atl2.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c
index 688c21e..b8d5857 100644
--- a/drivers/net/atlx/atl2.c
+++ b/drivers/net/atlx/atl2.c
@@ -1681,9 +1681,11 @@ static int atl2_resume(struct pci_dev *pdev)
ATL2_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0);
- err = atl2_request_irq(adapter);
- if (netif_running(netdev) && err)
- return err;
+ if (netif_running(netdev)) {
+ err = atl2_request_irq(adapter);
+ if (err)
+ return err;
+ }
atl2_reset_hw(&adapter->hw);