From d6e1e81e15dd3ef275604755f9efaadf454b9ea4 Mon Sep 17 00:00:00 2001
From: "John W. Linville" <linville@tuxdriver.com>
Date: Tue, 8 Nov 2005 15:59:30 -0500
Subject: [PATCH] --- yaml --- r: 15807 b: refs/heads/master c:
 6b27adb607282addcfe2707783dfcc28ba3a753b h: refs/heads/master i:   15805:
 74bd997237e21ff37e2cab2a6593be53fc6049fd   15803:
 b782c92e1727f8ca70b29316a0c0787e822afd65   15799:
 3c32464571550b3b2e4eb62e7ad74b568b4492e1   15791:
 cb9a07dc1ac9b6b4c0fbe16ea2179b071145c1f8   15775:
 ee5c0c9db3c31a5db962766ffb577aaf7b9e155c   15743:
 37b913db50c75040d77a3236cd2ec47d85c94ecf v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/net/e1000/e1000_ethtool.c | 12 ++++++++++--
 2 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index a5f6fc139316..db999093a406 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: e98fc4aae10b925ad5aa739c483abf78d80b66db
+refs/heads/master: 6b27adb607282addcfe2707783dfcc28ba3a753b
diff --git a/trunk/drivers/net/e1000/e1000_ethtool.c b/trunk/drivers/net/e1000/e1000_ethtool.c
index 8584e9382c2c..8646914964e7 100644
--- a/trunk/drivers/net/e1000/e1000_ethtool.c
+++ b/trunk/drivers/net/e1000/e1000_ethtool.c
@@ -960,13 +960,21 @@ e1000_free_desc_rings(struct e1000_adapter *adapter)
 		}
 	}
 
-	if(txdr->desc)
+	if(txdr->desc) {
 		pci_free_consistent(pdev, txdr->size, txdr->desc, txdr->dma);
-	if(rxdr->desc)
+		txdr->desc = NULL;
+	}
+	if(rxdr->desc) {
 		pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma);
+		rxdr->desc = NULL;
+	}
 
 	kfree(txdr->buffer_info);
+	txdr->buffer_info = NULL;
+
 	kfree(rxdr->buffer_info);
+	rxdr->buffer_info = NULL;
+
 	return;
 }