]> Pileus Git - ~andy/linux/commitdiff
staging: rtl8187se: Remove NULL check before kfree
authorIlia Mirkin <imirkin@alum.mit.edu>
Sun, 13 Mar 2011 05:29:05 +0000 (00:29 -0500)
committerGreg Kroah-Hartman <gregkh@suse.de>
Mon, 14 Mar 2011 18:57:34 +0000 (11:57 -0700)
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>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
drivers/staging/rtl8187se/ieee80211/ieee80211_softmac.c
drivers/staging/rtl8187se/ieee80211/ieee80211_wx.c

index 74a3b4c211ad41c94789b386f11d97b3661a97a0..771e0196842e7f4b0af7d1c5d1910e8b52fecb07 100644 (file)
@@ -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);
 }
 
index 07d8dbcdca288345ad9075b4f2191e753c091261..ca414a915a4e1ad0061b1bae4f6510f835b918e6 100644 (file)
@@ -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;