diff options
| author | Simon Horman <horms@verge.net.au> | 2008-08-27 22:47:46 +1000 |
|---|---|---|
| committer | Simon Horman <horms@verge.net.au> | 2008-08-27 22:47:46 +1000 |
| commit | b18e30412dde08536c9df6eae3f571fddb560e7f (patch) | |
| tree | 1ca4e3ea848d3035311f29a6f03cb884e82e6639 /drivers/net/atl1e/atl1e_main.c | |
| parent | 09bf825e8e3049db1d72d464d0a6b857cc037a43 (diff) | |
| parent | f2455eb176ac87081bbfc9a44b21c7cd2bc1967e (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
Diffstat (limited to 'drivers/net/atl1e/atl1e_main.c')
| -rw-r--r-- | drivers/net/atl1e/atl1e_main.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c index 82d7be1655d..7685b995ff9 100644 --- a/drivers/net/atl1e/atl1e_main.c +++ b/drivers/net/atl1e/atl1e_main.c @@ -2232,10 +2232,11 @@ static int atl1e_resume(struct pci_dev *pdev) AT_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); - if (netif_running(netdev)) + if (netif_running(netdev)) { err = atl1e_request_irq(adapter); if (err) return err; + } atl1e_reset_hw(&adapter->hw); |