From patchwork Mon Apr 9 20:50:42 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 151474 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id EB3DBB7006 for ; Tue, 10 Apr 2012 06:57:01 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757573Ab2DIUur (ORCPT ); Mon, 9 Apr 2012 16:50:47 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:45077 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753224Ab2DIUun (ORCPT ); Mon, 9 Apr 2012 16:50:43 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 8B00E9403F; Mon, 9 Apr 2012 22:50:42 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 83B1B9403D; Mon, 9 Apr 2012 22:50:42 +0200 (CEST) Date: Mon, 9 Apr 2012 22:50:42 +0200 (CEST) From: Jesper Juhl To: linux-kernel@vger.kernel.org cc: trivial@kernel.org, netdev@vger.kernel.org, Andy Gospodarek Subject: [PATCH 09/26] tehuti: delete redundant NULL check before release_firmware() In-Reply-To: Message-ID: References: User-Agent: Alpine 2.00 (LNX 1167 2008-08-23) MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org release_firmware() checks for NULL pointers - no need to test before the call. Signed-off-by: Jesper Juhl Signed-off-by: Andy Gospodarek --- drivers/net/ethernet/tehuti/tehuti.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/net/ethernet/tehuti/tehuti.c b/drivers/net/ethernet/tehuti/tehuti.c index ad973ff..a445e77 100644 --- a/drivers/net/ethernet/tehuti/tehuti.c +++ b/drivers/net/ethernet/tehuti/tehuti.c @@ -341,8 +341,8 @@ static int bdx_fw_load(struct bdx_priv *priv) out: if (master) WRITE_REG(priv, regINIT_SEMAPHORE, 1); - if (fw) - release_firmware(fw); + + release_firmware(fw); if (rc) { netdev_err(priv->ndev, "firmware loading failed\n");