Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754751Ab1CMFaY (ORCPT <rfc822;w@1wt.eu>);
	Sun, 13 Mar 2011 00:30:24 -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 S1751672Ab1CMF3o (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Sun, 13 Mar 2011 00:29:44 -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=PdLzf/s9QW/gSck6J1Mj9jBHDeSUYsdC6R1Hgjo+piLXtqIqv2cFX/1JAfgucRUYqU
         5JxhGohQBXvW67djju0L9HA88VtUsNWeBRgD0SgmnejrG+wwOoUyyw8lVkkOPpmtMUF9
         fqPoQOiAX+R1LjXcGLTuQ7wA2mgr1s8nCLfh0=
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 12/24] staging: rtl8187se: Remove NULL check before kfree
Date: Sun, 13 Mar 2011 00:29:05 -0500
Message-Id: <1299994157-11191-13-git-send-email-imirkin@alum.mit.edu>
X-Mailer: git-send-email 1.7.3.4
In-Reply-To: <1299994157-11191-12-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>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 1771
Lines: 52

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>
---
 .../rtl8187se/ieee80211/ieee80211_softmac.c        |    3 +--
 drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c |    1 -
 2 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 74a3b4c..771e019 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
@@ -2605,8 +2605,7 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee)
 	cancel_delayed_work(&ieee->GPIOChangeRFWorkItem);
 
 	destroy_workqueue(ieee->wq);
-	if(NULL != ieee->pDot11dInfo)
-		kfree(ieee->pDot11dInfo);
+	kfree(ieee->pDot11dInfo);
 	up(&ieee->wx_sem);
 }
 
diff --git a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
index 07d8dbc..ca414a9 100644
--- a/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
+++ b/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
@@ -735,7 +735,6 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
 		ieee->wpa_ie_len = len;
 	}
 	else{
-		if (ieee->wpa_ie)
 		kfree(ieee->wpa_ie);
 		ieee->wpa_ie = NULL;
 		ieee->wpa_ie_len = 0;
-- 
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/