From 55e174ac452a1506a24f7d247e0d8a9340ece25f Mon Sep 17 00:00:00 2001
From: Alexander Duyck <alexander.h.duyck@intel.com>
Date: Tue, 15 Feb 2011 02:12:05 +0000
Subject: [PATCH] --- yaml --- r: 237557 b: refs/heads/master c:
 894ff7cf0e0cf7596f9b0d3c30e32c87f8df2784 h: refs/heads/master i:   237555:
 7307ae05fd452ebfe091ea471d9611206662dcf3 v: v3

---
 [refs]                               | 2 +-
 trunk/drivers/net/ixgbe/ixgbe_main.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 11ed0471d803..5db41f7f8357 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dbf893ee85369debaa05b3c222a40c8ac5273a06
+refs/heads/master: 894ff7cf0e0cf7596f9b0d3c30e32c87f8df2784
diff --git a/trunk/drivers/net/ixgbe/ixgbe_main.c b/trunk/drivers/net/ixgbe/ixgbe_main.c
index f0d0c5aad2b4..588661ba2b9b 100644
--- a/trunk/drivers/net/ixgbe/ixgbe_main.c
+++ b/trunk/drivers/net/ixgbe/ixgbe_main.c
@@ -2597,6 +2597,11 @@ static void ixgbe_free_irq(struct ixgbe_adapter *adapter)
 
 		i--;
 		for (; i >= 0; i--) {
+			/* free only the irqs that were actually requested */
+			if (!adapter->q_vector[i]->rxr_count &&
+			    !adapter->q_vector[i]->txr_count)
+				continue;
+
 			free_irq(adapter->msix_entries[i].vector,
 				 adapter->q_vector[i]);
 		}