From patchwork Mon Apr 9 20:51:12 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 151470 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 BFBB6B6FDF for ; Tue, 10 Apr 2012 06:55:44 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758042Ab2DIUvQ (ORCPT ); Mon, 9 Apr 2012 16:51:16 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:21039 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758032Ab2DIUvN (ORCPT ); Mon, 9 Apr 2012 16:51:13 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id EBF149403F; Mon, 9 Apr 2012 22:51:12 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id E9C659403B; Mon, 9 Apr 2012 22:51:12 +0200 (CEST) Date: Mon, 9 Apr 2012 22:51:12 +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" , Bing Zhao Subject: [PATCH 14/26] wireless, mwifiex: drop redundant NULL test before call to 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 Since release_firmware() does its own test for NULL it is redundant to do so before calling it. Signed-off-by: Jesper Juhl Acked-by: Bing Zhao --- drivers/net/wireless/mwifiex/main.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/mwifiex/main.c b/drivers/net/wireless/mwifiex/main.c index 9d1b3ca..2ee6162 100644 --- a/drivers/net/wireless/mwifiex/main.c +++ b/drivers/net/wireless/mwifiex/main.c @@ -342,8 +342,7 @@ static int mwifiex_init_hw_fw(struct mwifiex_adapter *adapter) ret = 0; done: - if (adapter->firmware) - release_firmware(adapter->firmware); + release_firmware(adapter->firmware); if (ret) ret = -1; return ret;