From patchwork Wed Jun 10 14:13:47 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Figo.zhang" X-Patchwork-Id: 28409 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@bilbo.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from ozlabs.org (ozlabs.org [203.10.76.45]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mx.ozlabs.org", Issuer "CA Cert Signing Authority" (verified OK)) by bilbo.ozlabs.org (Postfix) with ESMTPS id ED6E5B70BA for ; Thu, 11 Jun 2009 00:13:59 +1000 (EST) Received: by ozlabs.org (Postfix) id DED5BDDD0C; Thu, 11 Jun 2009 00:13:59 +1000 (EST) Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 52F54DDD0B for ; Thu, 11 Jun 2009 00:13:59 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753618AbZFJONu (ORCPT ); Wed, 10 Jun 2009 10:13:50 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753514AbZFJONt (ORCPT ); Wed, 10 Jun 2009 10:13:49 -0400 Received: from rv-out-0506.google.com ([209.85.198.238]:22488 "EHLO rv-out-0506.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752976AbZFJONt (ORCPT ); Wed, 10 Jun 2009 10:13:49 -0400 Received: by rv-out-0506.google.com with SMTP id f9so266056rvb.1 for ; Wed, 10 Jun 2009 07:13:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=Oc6ipmNf2K8pG+P9N4bN70L4/sC7Kt9oSGIP6WpHm34=; b=kVkNEGS/CF/N+MO3WsRztejQexm2uA75GE1bVeyeOVQ2mhE4IuAxGpRwjYGXfIKJeT aZJdwZPYLtXVgtMttPOjvlX1V38iMrZJ5cH0eqTC3+gqBtsWfbO91xgWfLCzYjyw2UZJ Rj2spl1XT853BYuyrA3PkwUNbEUywt6yE0Rkw= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=oqJ+MVzPu3dxVx/srNY5MbzyJ9CulPLVoeKPUQE3IN4wQB82BOSpypMU8u/f0pT02p +lAReKkB2vm7AHR4CNnZjYwDfCEa2T9txMxmTSNAO6hXkaY2FPwy0Jj1nkV5zbBmtQg2 Co7dixUfueSsEMDzdD9mbTI0sYLiyYX+378QI= Received: by 10.141.116.17 with SMTP id t17mr1264668rvm.268.1244643231206; Wed, 10 Jun 2009 07:13:51 -0700 (PDT) Received: from ?221.137.242.99? ([221.137.242.99]) by mx.google.com with ESMTPS id f21sm3048306rvb.25.2009.06.10.07.13.49 (version=SSLv3 cipher=RC4-MD5); Wed, 10 Jun 2009 07:13:50 -0700 (PDT) Subject: [PATCH]netxen: fix checking From: "Figo.zhang" To: "David S. Miller" Cc: netdev@vger.kernel.org, Dhananjay Phadke Date: Wed, 10 Jun 2009 22:13:47 +0800 Message-Id: <1244643227.3422.3.camel@myhost> Mime-Version: 1.0 X-Mailer: Evolution 2.26.2 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org vfree() does its own 'NULL' check, so no need for check before calling it. Signed-off-by: Figo.zhang --- drivers/net/netxen/netxen_nic_init.c | 9 +++------ 1 files changed, 3 insertions(+), 6 deletions(-) --- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/net/netxen/netxen_nic_init.c b/drivers/net/netxen/netxen_nic_init.c index 0759c35..7ab0aa4 100644 --- a/drivers/net/netxen/netxen_nic_init.c +++ b/drivers/net/netxen/netxen_nic_init.c @@ -208,14 +208,11 @@ void netxen_free_sw_resources(struct netxen_adapter *adapter) recv_ctx = &adapter->recv_ctx; 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; } - if (adapter->cmd_buf_arr) - vfree(adapter->cmd_buf_arr); + vfree(adapter->cmd_buf_arr); return; }