From f98d9f347b36e27a7ee2a82768ca20b30521884c Mon Sep 17 00:00:00 2001
From: Ilia Mirkin <imirkin@alum.mit.edu>
Date: Sun, 13 Mar 2011 00:29:15 -0500
Subject: [PATCH] --- yaml --- r: 236470 b: refs/heads/master c:
 1d5c536efeb9c109e330209867ae1242d42cdb7b h: refs/heads/master v: v3

---
 [refs]                                  |  2 +-
 trunk/drivers/staging/vt6656/firmware.c |  3 +--
 trunk/drivers/staging/vt6656/hostap.c   |  3 +--
 trunk/drivers/staging/vt6656/main_usb.c | 12 ++++--------
 trunk/drivers/staging/vt6656/wpactl.c   |  3 +--
 5 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 4606e7a929ff..14db8006ff69 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6403bb7dc1f6d77a93850935d9277a0d74783cf0
+refs/heads/master: 1d5c536efeb9c109e330209867ae1242d42cdb7b
diff --git a/trunk/drivers/staging/vt6656/firmware.c b/trunk/drivers/staging/vt6656/firmware.c
index 162541255a02..8c8126a3540b 100644
--- a/trunk/drivers/staging/vt6656/firmware.c
+++ b/trunk/drivers/staging/vt6656/firmware.c
@@ -109,8 +109,7 @@ FIRMWAREbDownload(
 	result = TRUE;
 
 out:
-	if (pBuffer)
-		kfree(pBuffer);
+	kfree(pBuffer);
 
 	spin_lock_irq(&pDevice->lock);
 	return result;
diff --git a/trunk/drivers/staging/vt6656/hostap.c b/trunk/drivers/staging/vt6656/hostap.c
index f70e922a615b..51b5adf36577 100644
--- a/trunk/drivers/staging/vt6656/hostap.c
+++ b/trunk/drivers/staging/vt6656/hostap.c
@@ -858,8 +858,7 @@ int vt6656_hostap_ioctl(PSDevice pDevice, struct iw_point *p)
 	}
 
  out:
-	if (param != NULL)
-		kfree(param);
+	kfree(param);
 
 	return ret;
 }
diff --git a/trunk/drivers/staging/vt6656/main_usb.c b/trunk/drivers/staging/vt6656/main_usb.c
index 37d639602c8b..af14ab01ed7b 100644
--- a/trunk/drivers/staging/vt6656/main_usb.c
+++ b/trunk/drivers/staging/vt6656/main_usb.c
@@ -837,8 +837,7 @@ static void device_free_tx_bufs(PSDevice pDevice)
             usb_kill_urb(pTxContext->pUrb);
             usb_free_urb(pTxContext->pUrb);
         }
-        if (pTxContext)
-            kfree(pTxContext);
+        kfree(pTxContext);
     }
     return;
 }
@@ -861,8 +860,7 @@ static void device_free_rx_bufs(PSDevice pDevice)
         if (pRCB->skb)
             dev_kfree_skb(pRCB->skb);
     }
-    if (pDevice->pRCBMem)
-        kfree(pDevice->pRCBMem);
+    kfree(pDevice->pRCBMem);
 
     return;
 }
@@ -878,8 +876,7 @@ static void usb_device_reset(PSDevice pDevice)
 
 static void device_free_int_bufs(PSDevice pDevice)
 {
-    if (pDevice->intBuf.pDataBuf != NULL)
-        kfree(pDevice->intBuf.pDataBuf);
+    kfree(pDevice->intBuf.pDataBuf);
     return;
 }
 
@@ -1480,8 +1477,7 @@ static unsigned char *Config_FileOperation(PSDevice pDevice)
   */
 
 if(result!=0) {
-    if(buffer)
-  	 kfree(buffer);
+    kfree(buffer);
     buffer=NULL;
 }
   return buffer;
diff --git a/trunk/drivers/staging/vt6656/wpactl.c b/trunk/drivers/staging/vt6656/wpactl.c
index 7fd300f2e7c3..8752736181bb 100644
--- a/trunk/drivers/staging/vt6656/wpactl.c
+++ b/trunk/drivers/staging/vt6656/wpactl.c
@@ -999,8 +999,7 @@ int wpa_ioctl(PSDevice pDevice, struct iw_point *p)
 	}
 
 out:
-	if (param != NULL)
-		kfree(param);
+	kfree(param);
 
 	return ret;
 }