From 25f9ec1ba05d75653362be995c357b04bd95f8a8 Mon Sep 17 00:00:00 2001
From: Matt Carlson <mcarlson@broadcom.com>
Date: Fri, 4 Nov 2011 09:15:01 +0000
Subject: [PATCH] --- yaml --- r: 275072 b: refs/heads/master c:
 5bc09186deba2a016b60aa3923fc0e42838ce877 h: refs/heads/master v: v3

---
 [refs]                                    | 2 +-
 trunk/drivers/net/ethernet/broadcom/tg3.c | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 8c3958f48d72..aaef39d05bbc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ba1142e4fb291c7bf124d93596351dca8d226a0f
+refs/heads/master: 5bc09186deba2a016b60aa3923fc0e42838ce877
diff --git a/trunk/drivers/net/ethernet/broadcom/tg3.c b/trunk/drivers/net/ethernet/broadcom/tg3.c
index 3a7517910eed..0413e1e85641 100644
--- a/trunk/drivers/net/ethernet/broadcom/tg3.c
+++ b/trunk/drivers/net/ethernet/broadcom/tg3.c
@@ -9677,15 +9677,14 @@ static int tg3_open(struct net_device *dev)
 		struct tg3_napi *tnapi = &tp->napi[i];
 		err = tg3_request_irq(tp, i);
 		if (err) {
-			for (i--; i >= 0; i--)
+			for (i--; i >= 0; i--) {
+				tnapi = &tp->napi[i];
 				free_irq(tnapi->irq_vec, tnapi);
-			break;
+			}
+			goto err_out2;
 		}
 	}
 
-	if (err)
-		goto err_out2;
-
 	tg3_full_lock(tp, 0);
 
 	err = tg3_init_hw(tp, 1);