mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-23 09:19:51 +00:00
[PATCH] e1000: Fix desc. clean up
These were two separate community submitted patches. Signed-off-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com> Signed-off-by: Jesse Brandeburg <jesse.brandeburg@intel.com> Signed-off-by: John Ronciak <john.ronciak@intel.com> Signed-off-by: Jeff Garzik <jgarzik@pobox.com>
This commit is contained in:
parent
392137fa9b
commit
f5645110aa
1 changed files with 3 additions and 2 deletions
|
@ -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);
|
||||
txdr->desc = NULL;
|
||||
}
|
||||
if(rxdr->desc) {
|
||||
if (rxdr->desc) {
|
||||
pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma);
|
||||
rxdr->desc = NULL;
|
||||
}
|
||||
|
@ -993,6 +993,7 @@ e1000_free_desc_rings(struct e1000_adapter *adapter)
|
|||
txdr->buffer_info = NULL;
|
||||
kfree(rxdr->buffer_info);
|
||||
rxdr->buffer_info = NULL;
|
||||
|
||||
return;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue