From patchwork Mon Apr 9 20:52:34 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 151468 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 CD089B7021 for ; Tue, 10 Apr 2012 06:53:43 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758226Ab2DIUwh (ORCPT ); Mon, 9 Apr 2012 16:52:37 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:21415 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753197Ab2DIUwf (ORCPT ); Mon, 9 Apr 2012 16:52:35 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id B195594051; Mon, 9 Apr 2012 22:52:34 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id AF7719403D; Mon, 9 Apr 2012 22:52:34 +0200 (CEST) Date: Mon, 9 Apr 2012 22:52:34 +0200 (CEST) From: Jesper Juhl To: linux-kernel@vger.kernel.org cc: trivial@kernel.org, netdev@vger.kernel.org, linux-wireless@vger.kernel.org, "John W. Linville" , Stanislav Yakovlev Subject: [PATCH 26/26] ipw2100: remove a redundant NULL check before calling 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 The release_firmware() function does its own NULL test so a test before calling it is rather redundant. Signed-off-by: Jesper Juhl --- drivers/net/wireless/ipw2x00/ipw2100.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/ipw2x00/ipw2100.c b/drivers/net/wireless/ipw2x00/ipw2100.c index f0551f8..d8d804e 100644 --- a/drivers/net/wireless/ipw2x00/ipw2100.c +++ b/drivers/net/wireless/ipw2x00/ipw2100.c @@ -8508,8 +8508,7 @@ static void ipw2100_release_firmware(struct ipw2100_priv *priv, struct ipw2100_fw *fw) { fw->version = 0; - if (fw->fw_entry) - release_firmware(fw->fw_entry); + release_firmware(fw->fw_entry); fw->fw_entry = NULL; }