From 60f4710ac3fa9cfc6e70b4b0880d47e2e947a2ae Mon Sep 17 00:00:00 2001 From: "Figo.zhang" Date: Thu, 11 Jun 2009 02:49:10 -0700 Subject: [PATCH] --- yaml --- r: 150845 b: refs/heads/master c: f2333a014c1e13ac8e1b73a6fd77731c524eff78 h: refs/heads/master i: 150843: a07f4d13956e330f12d957f6ac52b06f8914aa2b v: v3 --- [refs] | 2 +- trunk/drivers/net/netxen/netxen_nic_init.c | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a551151c1207..9d42de3e9481 100644 --- 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 index 4a51c31330da..6f77ad58e3b3 100644 --- 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)