diff options
author | Jesper Juhl <jesper.juhl@gmail.com> | 2005-10-28 16:53:13 -0400 |
---|---|---|
committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 16:53:13 -0400 |
commit | b4558ea93d66a43f7990d26f145fd4c54a01c9bf (patch) | |
tree | 70aa8ba4864f8ee994b7f5278f5045af6a646d34 /drivers/net/e1000/e1000_ethtool.c | |
parent | 7380a78a973a8109c13cb0e47617c456b6f6e1f5 (diff) |
drivers/net: Remove pointless checks for NULL prior to calling kfree()
Diffstat (limited to 'drivers/net/e1000/e1000_ethtool.c')
-rw-r--r-- | drivers/net/e1000/e1000_ethtool.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/drivers/net/e1000/e1000_ethtool.c b/drivers/net/e1000/e1000_ethtool.c index 6b9acc7f94a3..9c7feaeaa6a4 100644 --- a/drivers/net/e1000/e1000_ethtool.c +++ b/drivers/net/e1000/e1000_ethtool.c | |||
@@ -965,11 +965,8 @@ e1000_free_desc_rings(struct e1000_adapter *adapter) | |||
965 | if(rxdr->desc) | 965 | if(rxdr->desc) |
966 | pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma); | 966 | pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma); |
967 | 967 | ||
968 | if(txdr->buffer_info) | 968 | kfree(txdr->buffer_info); |
969 | kfree(txdr->buffer_info); | 969 | kfree(rxdr->buffer_info); |
970 | if(rxdr->buffer_info) | ||
971 | kfree(rxdr->buffer_info); | ||
972 | |||
973 | return; | 970 | return; |
974 | } | 971 | } |
975 | 972 | ||