From 6624698b1cb533750ba08bcaad48945db208c16e Mon Sep 17 00:00:00 2001 From: Moritz Muehlenhoff Date: Mon, 9 Feb 2009 19:33:42 +0100 Subject: [PATCH] --- yaml --- r: 141217 b: refs/heads/master c: 7c98f718786c3c6d03ee377b62838fff3cc8f573 h: refs/heads/master i: 141215: 3c1a5fe3aadcdf7e457fbbce57bbd579190879b6 v: v3 --- [refs] | 2 +- trunk/drivers/staging/wlan-ng/prism2sta.c | 9 +++------ trunk/drivers/staging/wlan-ng/prism2usb.c | 6 ++---- 3 files changed, 6 insertions(+), 11 deletions(-) diff --git a/[refs] b/[refs] index 09de4abf3b0d..0906827af8f6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e469ee7f561657e260690ae202a32adb60e26730 +refs/heads/master: 7c98f718786c3c6d03ee377b62838fff3cc8f573 diff --git a/trunk/drivers/staging/wlan-ng/prism2sta.c b/trunk/drivers/staging/wlan-ng/prism2sta.c index d720934be793..c3ab31ef703a 100644 --- a/trunk/drivers/staging/wlan-ng/prism2sta.c +++ b/trunk/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/trunk/drivers/staging/wlan-ng/prism2usb.c b/trunk/drivers/staging/wlan-ng/prism2usb.c index 0bb4e7833060..252312e79581 100644 --- a/trunk/drivers/staging/wlan-ng/prism2usb.c +++ b/trunk/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: