---

yaml --- r: 15807 b: refs/heads/master c: 6b27adb h: refs/heads/master i: 15805: 74bd997 15803: b782c92 15799: 3c32464 15791: cb9a07d 15775: ee5c0c9 15743: 37b913d v: v3
git-mirror · Nov 18, 2005 · d6e1e81 · d6e1e81
1 parent d50d723
commit d6e1e81
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 3 deletions.
diff --git 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
@@ -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;
 }