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/tulip | |
parent | 7380a78a973a8109c13cb0e47617c456b6f6e1f5 (diff) |
drivers/net: Remove pointless checks for NULL prior to calling kfree()
Diffstat (limited to 'drivers/net/tulip')
-rw-r--r-- | drivers/net/tulip/de2104x.c | 6 | ||||
-rw-r--r-- | drivers/net/tulip/tulip_core.c | 6 |
2 files changed, 4 insertions, 8 deletions
diff --git a/drivers/net/tulip/de2104x.c b/drivers/net/tulip/de2104x.c index 6b8eee8f7bfd..d7fb3ffe06ac 100644 --- a/drivers/net/tulip/de2104x.c +++ b/drivers/net/tulip/de2104x.c | |||
@@ -2076,8 +2076,7 @@ static int __init de_init_one (struct pci_dev *pdev, | |||
2076 | return 0; | 2076 | return 0; |
2077 | 2077 | ||
2078 | err_out_iomap: | 2078 | err_out_iomap: |
2079 | if (de->ee_data) | 2079 | kfree(de->ee_data); |
2080 | kfree(de->ee_data); | ||
2081 | iounmap(regs); | 2080 | iounmap(regs); |
2082 | err_out_res: | 2081 | err_out_res: |
2083 | pci_release_regions(pdev); | 2082 | pci_release_regions(pdev); |
@@ -2096,8 +2095,7 @@ static void __exit de_remove_one (struct pci_dev *pdev) | |||
2096 | if (!dev) | 2095 | if (!dev) |
2097 | BUG(); | 2096 | BUG(); |
2098 | unregister_netdev(dev); | 2097 | unregister_netdev(dev); |
2099 | if (de->ee_data) | 2098 | kfree(de->ee_data); |
2100 | kfree(de->ee_data); | ||
2101 | iounmap(de->regs); | 2099 | iounmap(de->regs); |
2102 | pci_release_regions(pdev); | 2100 | pci_release_regions(pdev); |
2103 | pci_disable_device(pdev); | 2101 | pci_disable_device(pdev); |
diff --git a/drivers/net/tulip/tulip_core.c b/drivers/net/tulip/tulip_core.c index 6266a9a7e6e3..125ed00e95a5 100644 --- a/drivers/net/tulip/tulip_core.c +++ b/drivers/net/tulip/tulip_core.c | |||
@@ -1727,8 +1727,7 @@ err_out_free_ring: | |||
1727 | tp->rx_ring, tp->rx_ring_dma); | 1727 | tp->rx_ring, tp->rx_ring_dma); |
1728 | 1728 | ||
1729 | err_out_mtable: | 1729 | err_out_mtable: |
1730 | if (tp->mtable) | 1730 | kfree (tp->mtable); |
1731 | kfree (tp->mtable); | ||
1732 | pci_iounmap(pdev, ioaddr); | 1731 | pci_iounmap(pdev, ioaddr); |
1733 | 1732 | ||
1734 | err_out_free_res: | 1733 | err_out_free_res: |
@@ -1806,8 +1805,7 @@ static void __devexit tulip_remove_one (struct pci_dev *pdev) | |||
1806 | sizeof (struct tulip_rx_desc) * RX_RING_SIZE + | 1805 | sizeof (struct tulip_rx_desc) * RX_RING_SIZE + |
1807 | sizeof (struct tulip_tx_desc) * TX_RING_SIZE, | 1806 | sizeof (struct tulip_tx_desc) * TX_RING_SIZE, |
1808 | tp->rx_ring, tp->rx_ring_dma); | 1807 | tp->rx_ring, tp->rx_ring_dma); |
1809 | if (tp->mtable) | 1808 | kfree (tp->mtable); |
1810 | kfree (tp->mtable); | ||
1811 | pci_iounmap(pdev, tp->base_addr); | 1809 | pci_iounmap(pdev, tp->base_addr); |
1812 | free_netdev (dev); | 1810 | free_netdev (dev); |
1813 | pci_release_regions (pdev); | 1811 | pci_release_regions (pdev); |