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/wireless/prism54 | |
parent | 7380a78a973a8109c13cb0e47617c456b6f6e1f5 (diff) |
drivers/net: Remove pointless checks for NULL prior to calling kfree()
Diffstat (limited to 'drivers/net/wireless/prism54')
-rw-r--r-- | drivers/net/wireless/prism54/islpci_dev.c | 3 | ||||
-rw-r--r-- | drivers/net/wireless/prism54/oid_mgt.c | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/drivers/net/wireless/prism54/islpci_dev.c b/drivers/net/wireless/prism54/islpci_dev.c index 6c9584a9f284..78bdb359835e 100644 --- a/drivers/net/wireless/prism54/islpci_dev.c +++ b/drivers/net/wireless/prism54/islpci_dev.c | |||
@@ -754,8 +754,7 @@ islpci_free_memory(islpci_private *priv) | |||
754 | pci_unmap_single(priv->pdev, buf->pci_addr, | 754 | pci_unmap_single(priv->pdev, buf->pci_addr, |
755 | buf->size, PCI_DMA_FROMDEVICE); | 755 | buf->size, PCI_DMA_FROMDEVICE); |
756 | buf->pci_addr = 0; | 756 | buf->pci_addr = 0; |
757 | if (buf->mem) | 757 | kfree(buf->mem); |
758 | kfree(buf->mem); | ||
759 | buf->size = 0; | 758 | buf->size = 0; |
760 | buf->mem = NULL; | 759 | buf->mem = NULL; |
761 | } | 760 | } |
diff --git a/drivers/net/wireless/prism54/oid_mgt.c b/drivers/net/wireless/prism54/oid_mgt.c index 12123e24b113..eea2f04c8c6d 100644 --- a/drivers/net/wireless/prism54/oid_mgt.c +++ b/drivers/net/wireless/prism54/oid_mgt.c | |||
@@ -268,11 +268,10 @@ mgt_clean(islpci_private *priv) | |||
268 | 268 | ||
269 | if (!priv->mib) | 269 | if (!priv->mib) |
270 | return; | 270 | return; |
271 | for (i = 0; i < OID_NUM_LAST; i++) | 271 | for (i = 0; i < OID_NUM_LAST; i++) { |
272 | if (priv->mib[i]) { | 272 | kfree(priv->mib[i]); |
273 | kfree(priv->mib[i]); | 273 | priv->mib[i] = NULL; |
274 | priv->mib[i] = NULL; | 274 | } |
275 | } | ||
276 | kfree(priv->mib); | 275 | kfree(priv->mib); |
277 | priv->mib = NULL; | 276 | priv->mib = NULL; |
278 | } | 277 | } |