diff options
| author | David S. Miller <davem@davemloft.net> | 2008-11-20 19:44:00 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-11-20 19:44:00 -0500 |
| commit | 6ab33d51713d6d60c7677c0d020910a8cb37e513 (patch) | |
| tree | 546c2ff099b2757e75cf34ddace874f1220f740e /drivers/net/atlx | |
| parent | 7be6065b39c3f1cfa796667eac1a2170465acc91 (diff) | |
| parent | 13d428afc007fcfcd6deeb215618f54cf9c0cae6 (diff) | |
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.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/net/atlx/atl2.c b/drivers/net/atlx/atl2.c index 688c21e81a8e..b8d585722e1a 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) | |||
| 1681 | 1681 | ||
| 1682 | ATL2_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); | 1682 | ATL2_WRITE_REG(&adapter->hw, REG_WOL_CTRL, 0); |
| 1683 | 1683 | ||
| 1684 | err = atl2_request_irq(adapter); | 1684 | if (netif_running(netdev)) { |
| 1685 | if (netif_running(netdev) && err) | 1685 | err = atl2_request_irq(adapter); |
| 1686 | return err; | 1686 | if (err) |
| 1687 | return err; | ||
| 1688 | } | ||
| 1687 | 1689 | ||
| 1688 | atl2_reset_hw(&adapter->hw); | 1690 | atl2_reset_hw(&adapter->hw); |
| 1689 | 1691 | ||