From 2c452085b76ad7a09f5d210ad515393f42ba50a1 Mon Sep 17 00:00:00 2001
From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sun, 13 Mar 2011 00:29:05 -0500
Subject: [PATCH] --- yaml --- r: 236460 b: refs/heads/master c:
 76be349c0045073bbed4f669f87e36b1d8fda256 h: refs/heads/master v: v3

---
 [refs]                                                        | 2 +-
 trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c | 3 +--
 trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c      | 1 -
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f7416fdcd180..3ac778faf7a0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: aea9d72f97218d45e993836bcb6c6e6fd49e0b90
+refs/heads/master: 76be349c0045073bbed4f669f87e36b1d8fda256
diff --git a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
index 74a3b4c211ad..771e0196842e 100644
--- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
+++ b/trunk/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/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c b/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
index 07d8dbcdca28..ca414a915a4e 100644
--- a/trunk/drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c
+++ b/trunk/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;