Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1756376Ab1CMFa4 (ORCPT <rfc822;w@1wt.eu>);
	Sun, 13 Mar 2011 00:30:56 -0500
Received: from mail-qw0-f46.google.com ([209.85.216.46]:50490 "EHLO
	mail-qw0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1753119Ab1CMFaB (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 13 Mar 2011 00:30:01 -0500
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to
         :references;
        b=SHrOPJPWFDfwZ3TOb+nhOLt4psNfDx/wb8FSaJn29NtMWC0zha4tWTNhEQJ+Xvq+rQ
         FUdO7ip3yh2XTi9TN8x5v2FcLhSqyxH8znpvQXbRNb3HFVfz5qlGHspLfGfCWm+SFDNZ
         pf/Po4Q1GuY4Kixtrc4NAXmigHNQDhSDMZKhs=
From: Ilia Mirkin <imirkin@alum.mit.edu>
To: Greg Kroah-Hartman <gregkh@suse.de>
Cc: devel@driverdev.osuosl.org, linux-kernel@vger.kernel.org
Subject: [PATCH 24/24] staging: wlan-ng: Remove NULL check before kfree
Date: Sun, 13 Mar 2011 00:29:17 -0500
Message-Id: <1299994157-11191-25-git-send-email-imirkin@alum.mit.edu>
X-Mailer: git-send-email 1.7.3.4
In-Reply-To: <1299994157-11191-24-git-send-email-imirkin@alum.mit.edu>
References: <20110222145452.GD1331@suse.de>
 <1299994157-11191-1-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-2-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-3-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-4-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-5-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-6-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-7-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-8-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-9-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-10-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-11-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-12-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-13-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-14-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-15-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-16-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-17-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-18-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-19-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-20-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-21-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-22-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-23-git-send-email-imirkin@alum.mit.edu>
 <1299994157-11191-24-git-send-email-imirkin@alum.mit.edu>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1719
Lines: 57

This patch was generated by the following semantic patch:
// <smpl>
@@ expression E; @@
- if (E != NULL) { kfree(E); }
+ kfree(E);

@@ expression E; @@
- if (E != NULL) { kfree(E); E = NULL; }
+ kfree(E);
+ E = NULL;
// </smpl>

Signed-off-by: Ilia Mirkin <imirkin@alum.mit.edu>
---
 drivers/staging/wlan-ng/hfa384x_usb.c |    6 ++----
 drivers/staging/wlan-ng/prism2fw.c    |    3 +--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/drivers/staging/wlan-ng/hfa384x_usb.c b/drivers/staging/wlan-ng/hfa384x_usb.c
index a6efc03..7843dfd 100644
--- a/drivers/staging/wlan-ng/hfa384x_usb.c
+++ b/drivers/staging/wlan-ng/hfa384x_usb.c
@@ -612,10 +612,8 @@ void hfa384x_destroy(hfa384x_t *hw)
 		hfa384x_drvr_stop(hw);
 	hw->state = HFA384x_STATE_PREINIT;
 
-	if (hw->scanresults) {
-		kfree(hw->scanresults);
-		hw->scanresults = NULL;
-	}
+	kfree(hw->scanresults);
+	hw->scanresults = NULL;
 
 	/* Now to clean out the auth queue */
 	while ((skb = skb_dequeue(&hw->authq)))
diff --git a/drivers/staging/wlan-ng/prism2fw.c b/drivers/staging/wlan-ng/prism2fw.c
index fd5ddb2..729d03d 100644
--- a/drivers/staging/wlan-ng/prism2fw.c
+++ b/drivers/staging/wlan-ng/prism2fw.c
@@ -443,8 +443,7 @@ void free_chunks(struct imgchunk *fchunk, unsigned int *nfchunks)
 {
 	int i;
 	for (i = 0; i < *nfchunks; i++) {
-		if (fchunk[i].data != NULL)
-			kfree(fchunk[i].data);
+		kfree(fchunk[i].data);
 	}
 	*nfchunks = 0;
 	memset(fchunk, 0, sizeof(*fchunk));
-- 
1.7.3.4

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/