git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
drivers/net: Remove pointless checks for NULL prior to calling kfree()
[safe/jmp/linux-2.6]
/
drivers
/
net
/
e1000
/
e1000_ethtool.c
diff --git
a/drivers/net/e1000/e1000_ethtool.c
b/drivers/net/e1000/e1000_ethtool.c
index
6b9acc7
..
9c7feae
100644
(file)
--- 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)
if(rxdr->desc)
pci_free_consistent(pdev, rxdr->size, rxdr->desc, rxdr->dma);
- if(txdr->buffer_info)
- kfree(txdr->buffer_info);
- if(rxdr->buffer_info)
- kfree(rxdr->buffer_info);
-
+ kfree(txdr->buffer_info);
+ kfree(rxdr->buffer_info);
return;
}