diff options
| author | Jeff Kirsher <jeffrey.t.kirsher@intel.com> | 2006-01-13 01:51:01 +0100 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 13:44:51 +0100 |
| commit | f5645110aa2ed2dcc3e0373821474506ed4dc512 (patch) | |
| tree | 9f613bb98018b7cb86df4f023ffa1dd77d659fd6 /drivers/net/e1000/e1000_ethtool.c | |
| parent | [PATCH] e1000: Fix TX timeout logic (diff) | |
| download | linux-f5645110aa2ed2dcc3e0373821474506ed4dc512.tar.xz linux-f5645110aa2ed2dcc3e0373821474506ed4dc512.zip | |
[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>
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
| -rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index ceb9cd059b90..ad9ca2ac25fa 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c @@ -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; } |