---

yaml --- r: 119258 b: refs/heads/master c: a849854 h: refs/heads/master v: v3
git-mirror · Nov 20, 2008 · 8354bc0 · 8354bc0
1 parent 9c9b289
commit 8354bc0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eedd726efbc439dbed94fb8577e5533a986b341f
+refs/heads/master: a849854fc7e200d5e5a437dec9c1d0e8b105e50f
diff --git a/trunk/drivers/net/atlx/atl2.c b/trunk/drivers/net/atlx/atl2.c
@@ -1690,9 +1690,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);