提交 f5645110 编写于 作者: J Jeff Kirsher 提交者: Jeff Garzik

[PATCH] e1000: Fix desc. clean up

These were two separate community submitted patches.
Signed-off-by: NJeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: NJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: NJohn Ronciak <john.ronciak@intel.com>
Signed-off-by: NJeff Garzik <jgarzik@pobox.com>
上级 392137fa
...@@ -980,11 +980,11 @@ e1000_free_desc_rings(struct e1000_adapter *adapter) ...@@ -980,11 +980,11 @@ e1000_free_desc_rings(struct e1000_adapter *adapter)
} }
} }
if(txdr->desc) { if (txdr->desc) {
pci_free_consistent(pdev, txdr->size, txdr->desc, txdr->dma); pci_free_consistent(pdev, txdr->size, txdr->desc, txdr->dma);
txdr->desc = NULL; txdr->desc = NULL;
} }
if(rxdr->desc) { if (rxdr->desc) {
pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma); pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma);
rxdr->desc = NULL; rxdr->desc = NULL;
} }
...@@ -993,6 +993,7 @@ e1000_free_desc_rings(struct e1000_adapter *adapter) ...@@ -993,6 +993,7 @@ e1000_free_desc_rings(struct e1000_adapter *adapter)
txdr->buffer_info = NULL; txdr->buffer_info = NULL;
kfree(rxdr->buffer_info); kfree(rxdr->buffer_info);
rxdr->buffer_info = NULL; rxdr->buffer_info = NULL;
return; return;
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册