提交 7e901dcd 编写于 作者: I Ilia Mirkin 提交者: Greg Kroah-Hartman

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: NIlia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 76be349c
...@@ -195,11 +195,8 @@ void free_ieee80211(struct net_device *dev) ...@@ -195,11 +195,8 @@ void free_ieee80211(struct net_device *dev)
{ {
struct ieee80211_device *ieee = netdev_priv(dev); struct ieee80211_device *ieee = netdev_priv(dev);
int i; int i;
if (ieee->pHTInfo != NULL) kfree(ieee->pHTInfo);
{ ieee->pHTInfo = NULL;
kfree(ieee->pHTInfo);
ieee->pHTInfo = NULL;
}
RemoveAllTS(ieee); RemoveAllTS(ieee);
ieee80211_softmac_free(ieee); ieee80211_softmac_free(ieee);
del_timer_sync(&ieee->crypt_deinit_timer); del_timer_sync(&ieee->crypt_deinit_timer);
......
...@@ -1411,11 +1411,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb, ...@@ -1411,11 +1411,8 @@ int ieee80211_rtl_rx(struct ieee80211_device *ieee, struct sk_buff *skb,
return 1; return 1;
rx_dropped: rx_dropped:
if (rxb != NULL) kfree(rxb);
{ rxb = NULL;
kfree(rxb);
rxb = NULL;
}
stats->rx_dropped++; stats->rx_dropped++;
/* Returning 0 indicates to caller that we have not handled the SKB-- /* Returning 0 indicates to caller that we have not handled the SKB--
......
...@@ -2818,11 +2818,8 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee) ...@@ -2818,11 +2818,8 @@ void ieee80211_softmac_free(struct ieee80211_device *ieee)
{ {
down(&ieee->wx_sem); down(&ieee->wx_sem);
#ifdef ENABLE_DOT11D #ifdef ENABLE_DOT11D
if(NULL != ieee->pDot11dInfo) kfree(ieee->pDot11dInfo);
{ ieee->pDot11dInfo = NULL;
kfree(ieee->pDot11dInfo);
ieee->pDot11dInfo = NULL;
}
#endif #endif
del_timer_sync(&ieee->associate_timer); del_timer_sync(&ieee->associate_timer);
......
...@@ -862,7 +862,6 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len) ...@@ -862,7 +862,6 @@ int ieee80211_wx_set_gen_ie(struct ieee80211_device *ieee, u8 *ie, size_t len)
ieee->wpa_ie_len = len; ieee->wpa_ie_len = len;
} }
else{ else{
if (ieee->wpa_ie)
kfree(ieee->wpa_ie); kfree(ieee->wpa_ie);
ieee->wpa_ie = NULL; ieee->wpa_ie = NULL;
ieee->wpa_ie_len = 0; ieee->wpa_ie_len = 0;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册