From 400838659314cc67032f35962eee5a8639981b61 Mon Sep 17 00:00:00 2001 From: Alexander Beregalov Date: Sat, 26 Mar 2011 20:18:14 +0300 Subject: [PATCH] Staging: rtl8712: redundant null check before kfree() Signed-off-by: Alexander Beregalov Signed-off-by: Greg Kroah-Hartman --- drivers/staging/rtl8712/rtl871x_cmd.c | 3 +-- drivers/staging/rtl8712/rtl871x_io.c | 6 ++---- drivers/staging/rtl8712/rtl871x_ioctl_linux.c | 3 +-- drivers/staging/rtl8712/rtl871x_mp.c | 3 +-- drivers/staging/rtl8712/rtl871x_xmit.c | 3 +-- 5 files changed, 6 insertions(+), 12 deletions(-) diff --git a/drivers/staging/rtl8712/rtl871x_cmd.c b/drivers/staging/rtl8712/rtl871x_cmd.c index fbb2e4eaae51..6b9daa6acbba 100644 --- a/drivers/staging/rtl8712/rtl871x_cmd.c +++ b/drivers/staging/rtl8712/rtl871x_cmd.c @@ -431,8 +431,7 @@ u8 r8712_joinbss_cmd(struct _adapter *padapter, struct wlan_network *pnetwork) } psecnetwork = (struct ndis_wlan_bssid_ex *)&psecuritypriv->sec_bss; if (psecnetwork == NULL) { - if (pcmd != NULL) - kfree((unsigned char *)pcmd); + kfree(pcmd); return _FAIL; } memset(psecnetwork, 0, t_len); diff --git a/drivers/staging/rtl8712/rtl871x_io.c b/drivers/staging/rtl8712/rtl871x_io.c index e6e3c3752a97..ca84ee02eacc 100644 --- a/drivers/staging/rtl8712/rtl871x_io.c +++ b/drivers/staging/rtl8712/rtl871x_io.c @@ -73,8 +73,7 @@ static uint _init_intf_hdl(struct _adapter *padapter, goto _init_intf_hdl_fail; return _SUCCESS; _init_intf_hdl_fail: - if (pintf_priv) - kfree((u8 *)pintf_priv); + kfree(pintf_priv); return _FAIL; } @@ -84,8 +83,7 @@ static void _unload_intf_hdl(struct intf_priv *pintfpriv) unload_intf_priv = &r8712_usb_unload_intf_priv; unload_intf_priv(pintfpriv); - if (pintfpriv) - kfree((u8 *)pintfpriv); + kfree(pintfpriv); } static uint register_intf_hdl(u8 *dev, struct intf_hdl *pintfhdl) diff --git a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c index bd315c77610a..f71183a4d04a 100644 --- a/drivers/staging/rtl8712/rtl871x_ioctl_linux.c +++ b/drivers/staging/rtl8712/rtl871x_ioctl_linux.c @@ -1732,8 +1732,7 @@ static int r871x_wx_set_enc_ext(struct net_device *dev, memcpy(param + 1, pext + 1, pext->key_len); } ret = wpa_set_encryption(dev, param, param_len); - if (param) - kfree((u8 *)param); + kfree(param); return ret; } diff --git a/drivers/staging/rtl8712/rtl871x_mp.c b/drivers/staging/rtl8712/rtl871x_mp.c index 427467cb10bd..3ad47912924e 100644 --- a/drivers/staging/rtl8712/rtl871x_mp.c +++ b/drivers/staging/rtl8712/rtl871x_mp.c @@ -274,8 +274,7 @@ void r8712_SetChannel(struct _adapter *pAdapter) pparm = (struct SetChannel_parm *)_malloc(sizeof(struct SetChannel_parm)); if (pparm == NULL) { - if (pcmd != NULL) - kfree((u8 *)pcmd); + kfree(pcmd); return; } pparm->curr_ch = pAdapter->mppriv.curr_ch; diff --git a/drivers/staging/rtl8712/rtl871x_xmit.c b/drivers/staging/rtl8712/rtl871x_xmit.c index 75f1a6bba2f6..ccf08911f58b 100644 --- a/drivers/staging/rtl8712/rtl871x_xmit.c +++ b/drivers/staging/rtl8712/rtl871x_xmit.c @@ -996,8 +996,7 @@ static void free_hwxmits(struct _adapter *padapter) { struct xmit_priv *pxmitpriv = &padapter->xmitpriv; - if (pxmitpriv->hwxmits) - kfree((u8 *)pxmitpriv->hwxmits); + kfree(pxmitpriv->hwxmits); } static void init_hwxmits(struct hw_xmit *phwxmit, sint entry) -- 2.20.1