diff options
author | Ilia Mirkin <imirkin@alum.mit.edu> | 2011-03-13 00:29:06 -0500 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@suse.de> | 2011-03-14 14:57:34 -0400 |
commit | 7e901dcd73d73230ad0e66e35fb6f1da244e41f7 (patch) | |
tree | 426afa9c7fcd5d3a18cab26ae1c7fd4001dad855 /drivers/staging/rtl8192e | |
parent | 76be349c0045073bbed4f669f87e36b1d8fda256 (diff) |
staging: rtl8192e: Remove NULL check before kfree
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>
Diffstat (limited to 'drivers/staging/rtl8192e')
4 files changed, 6 insertions, 16 deletions
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c index 67bcd41e66b..663b0b8e109 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_module.c | |||
@@ -195,11 +195,8 @@ void free_ieee80211(struct net_device *dev) | |||
195 | { | 195 | { |
196 | struct ieee80211_device *ieee = netdev_priv(dev); | 196 | struct ieee80211_device *ieee = netdev_priv(dev); |
197 | int i; | 197 | int i; |
198 | if (ieee->pHTInfo != NULL) | 198 | kfree(ieee->pHTInfo); |
199 | { | 199 | ieee->pHTInfo = NULL; |
200 | kfree(ieee->pHTInfo); | ||
201 | ieee->pHTInfo = NULL; | ||
202 | } | ||
203 | RemoveAllTS(ieee); | 200 | RemoveAllTS(ieee); |
204 | ieee80211_softmac_free(ieee); | 201 | ieee80211_softmac_free(ieee); |
205 | del_timer_sync(&ieee->crypt_deinit_timer); | 202 | del_timer_sync(&ieee->crypt_deinit_timer); |
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c index e2eac7cadf4..57acb3f21ad 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_rx.c | |||
@@ -1411,11 +1411,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, | |||
1411 | return 1; | 1411 | return 1; |
1412 | 1412 | ||
1413 | rx_dropped: | 1413 | rx_dropped: |
1414 | if (rxb != NULL) | 1414 | kfree(rxb); |
1415 | { | 1415 | rxb = NULL; |
1416 | kfree(rxb); | ||
1417 | rxb = NULL; | ||
1418 | } | ||
1419 | stats->rx_dropped++; | 1416 | stats->rx_dropped++; |
1420 | 1417 | ||
1421 | /* Returning 0 indicates to caller that we have not handled the SKB-- | 1418 | /* Returning 0 indicates to caller that we have not handled the SKB-- |
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c index fc96676bb9c..8d73a731376 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_softmac.c | |||
@@ -2818,11 +2818,8 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee) | |||
2818 | { | 2818 | { |
2819 | down(&ieee->wx_sem); | 2819 | down(&ieee->wx_sem); |
2820 | #ifdef ENABLE_DOT11D | 2820 | #ifdef ENABLE_DOT11D |
2821 | if(NULL != ieee->pDot11dInfo) | 2821 | kfree(ieee->pDot11dInfo); |
2822 | { | 2822 | ieee->pDot11dInfo = NULL; |
2823 | kfree(ieee->pDot11dInfo); | ||
2824 | ieee->pDot11dInfo = NULL; | ||
2825 | } | ||
2826 | #endif | 2823 | #endif |
2827 | del_timer_sync(&ieee->associate_timer); | 2824 | del_timer_sync(&ieee->associate_timer); |
2828 | 2825 | ||
diff --git a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c index cac340e5238..bb0ff26bd84 100644 --- a/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c +++ b/drivers/staging/rtl8192e/ieee80211/ieee80211_wx.c | |||
@@ -862,7 +862,6 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) | |||
862 | ieee->wpa_ie_len = len; | 862 | ieee->wpa_ie_len = len; |
863 | } | 863 | } |
864 | else{ | 864 | else{ |
865 | if (ieee->wpa_ie) | ||
866 | kfree(ieee->wpa_ie); | 865 | kfree(ieee->wpa_ie); |
867 | ieee->wpa_ie = NULL; | 866 | ieee->wpa_ie = NULL; |
868 | ieee->wpa_ie_len = 0; | 867 | ieee->wpa_ie_len = 0; |