Merge branch 'upstream-linus' of master.kernel.org:/pub/scm/linux/kernel/git/jgarzik...

[karo-tx-linux.git] / drivers / net / bnx2.c

diff --git a/drivers/net/bnx2.c b/drivers/net/bnx2.c
index 3a2ace01e444d082daaa31dc30de97c542d19054..11d25231822112b08fc478e64fea577b983a12e7 100644 (file)
--- a/drivers/net/bnx2.c
+++ b/drivers/net/bnx2.c
@@ -314,20 +314,16 @@ bnx2_free_mem(struct bnx2 *bp)
                                    bp->tx_desc_ring, bp->tx_desc_mapping);
                bp->tx_desc_ring = NULL;
        }
-       if (bp->tx_buf_ring) {
-               kfree(bp->tx_buf_ring);
-               bp->tx_buf_ring = NULL;
-       }
+       kfree(bp->tx_buf_ring);
+       bp->tx_buf_ring = NULL;
        if (bp->rx_desc_ring) {
                pci_free_consistent(bp->pdev,
                                    sizeof(struct rx_bd) * RX_DESC_CNT,
                                    bp->rx_desc_ring, bp->rx_desc_mapping);
                bp->rx_desc_ring = NULL;
        }
-       if (bp->rx_buf_ring) {
-               kfree(bp->rx_buf_ring);
-               bp->rx_buf_ring = NULL;
-       }
+       kfree(bp->rx_buf_ring);
+       bp->rx_buf_ring = NULL;
 }
 
 static int