openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Signed-off-by: Moritz Muehlenhoff <jmm@debian.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
This commit is contained in:
Moritz Muehlenhoff 2009-02-09 19:33:42 +01:00 committed by Greg Kroah-Hartman
parent e469ee7f56
commit 7c98f71878
2 changed files with 5 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
drivers/staging/wlan-ng/prism2sta.c
View File

@ -1134,8 +1134,7 @@ static void prism2sta_inf_hostscanresults(wlandevice_t *wlandev,
if (nbss > 32) if (nbss > 32)
nbss = 32; nbss = 32;
if (hw->scanresults) kfree(hw->scanresults);
kfree(hw->scanresults);
hw->scanresults = kmalloc(sizeof(hfa384x_InfFrame_t), GFP_ATOMIC); hw->scanresults = kmalloc(sizeof(hfa384x_InfFrame_t), GFP_ATOMIC);
memcpy(hw->scanresults, inf, sizeof(hfa384x_InfFrame_t)); memcpy(hw->scanresults, inf, sizeof(hfa384x_InfFrame_t));
@ -1966,10 +1965,8 @@ static wlandevice_t *create_wlan(void)
if (!wlandev || !hw) { if (!wlandev || !hw) {
printk(KERN_ERR "%s: Memory allocation failure.\n", dev_info); printk(KERN_ERR "%s: Memory allocation failure.\n", dev_info);
if (wlandev) kfree(wlandev);
kfree(wlandev); kfree(hw);
if (hw)
kfree(hw);
return NULL; return NULL;
} }

6
drivers/staging/wlan-ng/prism2usb.c
View File

@ -165,10 +165,8 @@ static int prism2sta_probe_usb(struct usb_interface *interface,
goto done; goto done;
failed: failed:
if (wlandev) kfree(wlandev);
kfree(wlandev); kfree(hw);
if (hw)
kfree(hw);
wlandev = NULL; wlandev = NULL;
done: done: