---

yaml --- r: 141217 b: refs/heads/master c: 7c98f71 h: refs/heads/master i: 141215: 3c1a5fe v: v3
git-mirror · Apr 3, 2009 · 6624698 · 6624698
1 parent 0009bc0
commit 6624698
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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: