Staging: wlan-ng: Remove unnecessary checks for NULL before calling kfree()

Signed-off-by: Moritz Muehlenhoff <[email protected]>
Signed-off-by: Greg Kroah-Hartman <[email protected]>

diff --git a/drivers/staging/wlan-ng/prism2sta.c b/drivers/staging/wlan-ng/prism2sta.c
index d720934be7937fcd37b97c56025d927072e090fe..c3ab31ef703af91edecaa932c5557bade1029523 100644 (file)
--- a/drivers/staging/wlan-ng/prism2sta.c
+++ b/drivers/staging/wlan-ng/prism2sta.c
@@ -1134,8 +1134,7 @@ static void prism2sta_inf_hostscanresults(wlandevice_t *wlandev,
        if (nbss > 32)
                nbss = 32;
 
-       if (hw->scanresults)
-               kfree(hw->scanresults);
+       kfree(hw->scanresults);
 
        hw->scanresults = kmalloc(sizeof(hfa384x_InfFrame_t), GFP_ATOMIC);
        memcpy(hw->scanresults, inf, sizeof(hfa384x_InfFrame_t));
@@ -1966,10 +1965,8 @@ static wlandevice_t *create_wlan(void)
 
        if (!wlandev || !hw) {
                printk(KERN_ERR "%s: Memory allocation failure.\n", dev_info);
-               if (wlandev)
-                       kfree(wlandev);
-               if (hw)
-                       kfree(hw);
+               kfree(wlandev);
+               kfree(hw);
                return NULL;
        }
 

diff --git a/drivers/staging/wlan-ng/prism2usb.c b/drivers/staging/wlan-ng/prism2usb.c
index 0bb4e78330604f10b761489329daca145e35cf74..252312e79581b13921919911dbdae10c6ec83014 100644 (file)
--- a/drivers/staging/wlan-ng/prism2usb.c
+++ b/drivers/staging/wlan-ng/prism2usb.c
@@ -165,10 +165,8 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
        goto done;
 
 failed:
-       if (wlandev)
-               kfree(wlandev);
-       if (hw)
-               kfree(hw);
+       kfree(wlandev);
+       kfree(hw);
        wlandev = NULL;
 
 done: