Commit 7ad61a38 authored by Aishwarya Pant's avatar Aishwarya Pant Committed by Greg Kroah-Hartman

staging: rtl8723bs: remove null test before kfree

kfree(..) on a NULL pointer is a no-op; the null test here is redundant.
Detected by coccicheck.
Signed-off-by: default avatarAishwarya Pant <aishpant@gmail.com>
Acked-by: default avatarLarry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9ddf6e34
...@@ -995,8 +995,7 @@ if (1) { ...@@ -995,8 +995,7 @@ if (1) {
rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_USAGE, (u8 *)&efuse_usage); rtw_hal_set_hwreg(padapter, HW_VAR_EFUSE_USAGE, (u8 *)&efuse_usage);
} }
if (efuseTbl) kfree(efuseTbl);
kfree(efuseTbl);
} }
static void hal_ReadEFuse_BT( static void hal_ReadEFuse_BT(
...@@ -1128,8 +1127,7 @@ static void hal_ReadEFuse_BT( ...@@ -1128,8 +1127,7 @@ static void hal_ReadEFuse_BT(
} }
exit: exit:
if (efuseTbl) kfree(efuseTbl);
kfree(efuseTbl);
} }
static void Hal_ReadEFuse( static void Hal_ReadEFuse(
......
...@@ -602,8 +602,7 @@ static s32 _sdio_local_read( ...@@ -602,8 +602,7 @@ static s32 _sdio_local_read(
if (!err) if (!err)
memcpy(pbuf, ptmpbuf, cnt); memcpy(pbuf, ptmpbuf, cnt);
if (ptmpbuf) kfree(ptmpbuf);
kfree(ptmpbuf);
return err; return err;
} }
...@@ -646,8 +645,7 @@ s32 sdio_local_read( ...@@ -646,8 +645,7 @@ s32 sdio_local_read(
if (!err) if (!err)
memcpy(pbuf, ptmpbuf, cnt); memcpy(pbuf, ptmpbuf, cnt);
if (ptmpbuf) kfree(ptmpbuf);
kfree(ptmpbuf);
return err; return err;
} }
......
...@@ -1170,10 +1170,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev, ...@@ -1170,10 +1170,7 @@ static int cfg80211_rtw_add_key(struct wiphy *wiphy, struct net_device *ndev,
} }
addkey_end: addkey_end:
if (param) kfree((u8 *)param);
{
kfree((u8 *)param);
}
return ret; return ret;
...@@ -1968,8 +1965,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel ...@@ -1968,8 +1965,7 @@ static int rtw_cfg80211_set_wpa_ie(struct adapter *padapter, u8 *pie, size_t iel
pairwise_cipher, padapter->securitypriv.ndisencryptstatus, padapter->securitypriv.ndisauthtype)); pairwise_cipher, padapter->securitypriv.ndisencryptstatus, padapter->securitypriv.ndisauthtype));
exit: exit:
if (buf) kfree(buf);
kfree(buf);
if (ret) if (ret)
_clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS); _clr_fwstate_(&padapter->mlmepriv, WIFI_UNDER_WPS);
return ret; return ret;
......
...@@ -766,9 +766,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param, ...@@ -766,9 +766,7 @@ static int wpa_set_encryption(struct net_device *dev, struct ieee_param *param,
exit: exit:
if (pwep) { kfree((u8 *)pwep);
kfree((u8 *)pwep);
}
return ret; return ret;
} }
...@@ -926,7 +924,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie ...@@ -926,7 +924,7 @@ static int rtw_set_wpa_ie(struct adapter *padapter, char *pie, unsigned short ie
exit: exit:
if (buf) kfree(buf); kfree(buf);
return ret; return ret;
} }
...@@ -2502,10 +2500,7 @@ static int rtw_wx_set_enc_ext(struct net_device *dev, ...@@ -2502,10 +2500,7 @@ static int rtw_wx_set_enc_ext(struct net_device *dev,
ret = wpa_set_encryption(dev, param, param_len); ret = wpa_set_encryption(dev, param, param_len);
exit: exit:
if (param) kfree((u8 *)param);
{
kfree((u8 *)param);
}
return ret; return ret;
} }
...@@ -4135,11 +4130,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param, ...@@ -4135,11 +4130,7 @@ static int rtw_set_encryption(struct net_device *dev, struct ieee_param *param,
} }
exit: exit:
kfree((u8 *)pwep);
if (pwep)
{
kfree((u8 *)pwep);
}
return ret; return ret;
...@@ -5785,12 +5776,9 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_ ...@@ -5785,12 +5776,9 @@ static int rtw_ioctl_wext_private(struct net_device *dev, union iwreq_data *wrq_
} }
exit: exit:
if (input) kfree(input);
kfree(input); kfree(buffer);
if (buffer) kfree(output);
kfree(buffer);
if (output)
kfree(output);
return err; return err;
} }
......
...@@ -76,10 +76,8 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb ...@@ -76,10 +76,8 @@ int rtw_os_xmit_resource_alloc(struct adapter *padapter, struct xmit_buf *pxmitb
void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 free_sz, u8 flag) void rtw_os_xmit_resource_free(struct adapter *padapter, struct xmit_buf *pxmitbuf, u32 free_sz, u8 flag)
{ {
if (free_sz > 0) { if (free_sz > 0)
if (pxmitbuf->pallocated_buf) kfree(pxmitbuf->pallocated_buf);
kfree(pxmitbuf->pallocated_buf);
}
} }
#define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5) #define WMM_XMIT_THRESHOLD (NR_XMITFRAME*2/5)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment