---

yaml --- r: 150845 b: refs/heads/master c: f2333a0 h: refs/heads/master i: 150843: a07f4d1 v: v3
git-mirror · Jun 11, 2009 · 60f4710 · 60f4710
1 parent a5cd0c9
commit 60f4710
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 934037bc2ed29a94bbde72aa6a2e66bdc5861b98
+refs/heads/master: f2333a014c1e13ac8e1b73a6fd77731c524eff78
diff --git a/trunk/drivers/net/netxen/netxen_nic_init.c b/trunk/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 @@ void netxen_free_sw_resources(struct netxen_adapter *adapter)
 		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)