From 3e9a1afa57c86954ff748466dd04b9bb8de57c05 Mon Sep 17 00:00:00 2001
From: Andy Gospodarek <andy@greyhouse.net>
Date: Fri, 15 Feb 2008 14:05:25 -0800
Subject: [PATCH] --- yaml --- r: 86437 b: refs/heads/master c:
 6cb5e57701d355737f0bc9f94c0f80ed69a95b62 h: refs/heads/master i:   86435:
 9ab754d17eb56931615f83c0445a9863ca124edf v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/net/igb/igb_main.c | 9 ++-------
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 61f4ebc98da0..4d11cb64fbb6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bd3670f31f1c58f500e55c4cdbc243fb4b2e3df
+refs/heads/master: 6cb5e57701d355737f0bc9f94c0f80ed69a95b62
diff --git a/trunk/drivers/net/igb/igb_main.c b/trunk/drivers/net/igb/igb_main.c
index bff280eff5e3..3480cc72467a 100644
--- a/trunk/drivers/net/igb/igb_main.c
+++ b/trunk/drivers/net/igb/igb_main.c
@@ -439,7 +439,7 @@ static int igb_request_irq(struct igb_adapter *adapter)
 		err = igb_request_msix(adapter);
 		if (!err) {
 			/* enable IAM, auto-mask,
-			 * DO NOT USE EIAME or IAME in legacy mode */
+			 * DO NOT USE EIAM or IAM in legacy mode */
 			wr32(E1000_IAM, IMS_ENABLE_MASK);
 			goto request_done;
 		}
@@ -465,14 +465,9 @@ static int igb_request_irq(struct igb_adapter *adapter)
 	err = request_irq(adapter->pdev->irq, &igb_intr, IRQF_SHARED,
 			  netdev->name, netdev);
 
-	if (err) {
+	if (err)
 		dev_err(&adapter->pdev->dev, "Error %d getting interrupt\n",
 			err);
-		goto request_done;
-	}
-
-	/* enable IAM, auto-mask */
-	wr32(E1000_IAM, IMS_ENABLE_MASK);
 
 request_done:
 	return err;