From patchwork Mon Apr 9 20:50:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Juhl X-Patchwork-Id: 151473 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 C0277B7006 for ; Tue, 10 Apr 2012 06:56:42 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757793Ab2DIUuz (ORCPT ); Mon, 9 Apr 2012 16:50:55 -0400 Received: from swampdragon.chaosbits.net ([90.184.90.115]:20965 "EHLO swampdragon.chaosbits.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757770Ab2DIUuy (ORCPT ); Mon, 9 Apr 2012 16:50:54 -0400 Received: by swampdragon.chaosbits.net (Postfix, from userid 1000) id 4FD4C9403F; Mon, 9 Apr 2012 22:50:53 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by swampdragon.chaosbits.net (Postfix) with ESMTP id 4DA039403B; Mon, 9 Apr 2012 22:50:53 +0200 (CEST) Date: Mon, 9 Apr 2012 22:50:53 +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" , Simon Kelley Subject: [PATCH 11/26] wireless, atmel: remove pointless test for NULL before release_firmware() call 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() does its own test. Explicitly checking before the call is redundant. Signed-off-by: Jesper Juhl --- drivers/net/wireless/atmel.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/drivers/net/wireless/atmel.c b/drivers/net/wireless/atmel.c index 6c87a82..d07c030 100644 --- a/drivers/net/wireless/atmel.c +++ b/drivers/net/wireless/atmel.c @@ -3989,8 +3989,7 @@ static int reset_atmel_card(struct net_device *dev) atmel_copy_to_card(priv->dev, 0x8000, &fw[0x6000], len - 0x6000); } - if (fw_entry) - release_firmware(fw_entry); + release_firmware(fw_entry); } err = atmel_wakeup_firmware(priv);