From 8354bc0209d3925a6d112078962cda4317d0cdd8 Mon Sep 17 00:00:00 2001
From: Alan Jenkins <alan-jenkins@tuffmail.co.uk>
Date: Thu, 20 Nov 2008 04:18:25 -0800
Subject: [PATCH] --- yaml --- r: 119258 b: refs/heads/master c:
 a849854fc7e200d5e5a437dec9c1d0e8b105e50f h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/net/atlx/atl2.c | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1afd2c09bae8..73eb07e3d2aa 100644
--- 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
index f5bdc92c1a65..8571e8c0bc67 100644
--- 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);