From: Figo.zhang <figo1802@gmail.com>
Date: Thu, 11 Jun 2009 09:49:10 +0000 (-0700)
Subject: netxen: No need to check vfree() pointer.
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=f2333a014c1e13ac8e1b73a6fd77731c524eff78;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git

netxen: No need to check vfree() pointer.

vfree() does its own 'NULL' check, so no need for check before
calling it.

Signed-off-by: Figo.zhang <figo1802@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c
index 4a51c31330da..6f77ad58e3b3 100644
--- a/drivers/net/netxen/netxen_nic_init.c
+++ b/drivers/net/netxen/netxen_nic_init.c
@@ -178,10 +178,8 @@ void netxen_free_sw_resources(struct netxen_adapter *adapter)
 
 	for (ring = 0; ring < adapter->max_rds_rings; ring++) {
 		rds_ring = &recv_ctx->rds_rings[ring];
-		if (rds_ring->rx_buf_arr) {
-			vfree(rds_ring->rx_buf_arr);
-			rds_ring->rx_buf_arr = NULL;
-		}
+		vfree(rds_ring->rx_buf_arr);
+		rds_ring->rx_buf_arr = NULL;
 	}
 	kfree(recv_ctx->rds_rings);
 
@@ -190,8 +188,7 @@ skip_rds:
 		return;
 
 	tx_ring = adapter->tx_ring;
-	if (tx_ring->cmd_buf_arr)
-		vfree(tx_ring->cmd_buf_arr);
+	vfree(tx_ring->cmd_buf_arr);
 }
 
 int netxen_alloc_sw_resources(struct netxen_adapter *adapter)