]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
staging: rtl8723bs: remove null check before kfree
authorHimanshu Jha <himanshujha199640@gmail.com>
Sat, 26 Aug 2017 20:47:04 +0000 (02:17 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sun, 27 Aug 2017 17:59:10 +0000 (19:59 +0200)
Kfree on NULL pointer is a no-op and therefore checking is redundant.

Signed-off-by: Himanshu Jha <himanshujha199640@gmail.com>
Acked-by: Larry Finger <Larry.Finger@lwfinger.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/rtl8723bs/os_dep/ioctl_linux.c

index c7bad646134e5a876cbc4ebc8f3fb345dbddc76c..d5e5f830f2a16388129fe25b01bf0b7eaa85ae69 100644 (file)
@@ -4120,10 +4120,8 @@ static int rtw_set_wps_beacon(struct net_device *dev, struct ieee_param *param,
        ie_len = len-12-2;/*  12 = param header, 2:no packed */
 
 
-       if (pmlmepriv->wps_beacon_ie) {
-               kfree(pmlmepriv->wps_beacon_ie);
-               pmlmepriv->wps_beacon_ie = NULL;
-       }
+       kfree(pmlmepriv->wps_beacon_ie);
+       pmlmepriv->wps_beacon_ie = NULL;
 
        if (ie_len>0) {
                pmlmepriv->wps_beacon_ie = rtw_malloc(ie_len);
@@ -4160,10 +4158,8 @@ static int rtw_set_wps_probe_resp(struct net_device *dev, struct ieee_param *par
        ie_len = len-12-2;/*  12 = param header, 2:no packed */
 
 
-       if (pmlmepriv->wps_probe_resp_ie) {
-               kfree(pmlmepriv->wps_probe_resp_ie);
-               pmlmepriv->wps_probe_resp_ie = NULL;
-       }
+       kfree(pmlmepriv->wps_probe_resp_ie);
+       pmlmepriv->wps_probe_resp_ie = NULL;
 
        if (ie_len>0) {
                pmlmepriv->wps_probe_resp_ie = rtw_malloc(ie_len);
@@ -4195,10 +4191,8 @@ static int rtw_set_wps_assoc_resp(struct net_device *dev, struct ieee_param *par
        ie_len = len-12-2;/*  12 = param header, 2:no packed */
 
 
-       if (pmlmepriv->wps_assoc_resp_ie) {
-               kfree(pmlmepriv->wps_assoc_resp_ie);
-               pmlmepriv->wps_assoc_resp_ie = NULL;
-       }
+       kfree(pmlmepriv->wps_assoc_resp_ie);
+       pmlmepriv->wps_assoc_resp_ie = NULL;
 
        if (ie_len>0) {
                pmlmepriv->wps_assoc_resp_ie = rtw_malloc(ie_len);