From fa7689fd1a2966976d15e531d1d780981e3e14d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ilpo=20J=C3=A4rvinen?= Date: Tue, 19 Aug 2008 10:32:06 +0300 Subject: [PATCH] --- yaml --- r: 109261 b: refs/heads/master c: 50f684b900de431729d6f77e69c941560936f275 h: refs/heads/master i: 109259: babf832cc5760743d16beaa7784b60fe19041d52 v: v3 --- [refs] | 2 +- trunk/drivers/net/atl1e/atl1e_main.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index cc4bffd5b4fe..c3445b2f43e9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17fc7004a3f552b52274b6b2fbbebd7ff76dc1d5 +refs/heads/master: 50f684b900de431729d6f77e69c941560936f275 diff --git a/trunk/drivers/net/atl1e/atl1e_main.c b/trunk/drivers/net/atl1e/atl1e_main.c index 82d7be1655d3..7685b995ff9b 100644 --- a/trunk/drivers/net/atl1e/atl1e_main.c +++ b/trunk/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);