From e72447a416659f05adf66f82e4fe59ec01e5deb8 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Tue, 28 Aug 2012 21:10:35 +0800
Subject: [PATCH] --- yaml --- r: 324743 b: refs/heads/master c:
 085b50186dff9dc551b54d09be0c21ec925e7fc7 h: refs/heads/master i:   324741:
 525db4f4f1c5265abe9abf357ce24d27e452164a   324739:
 93272018aed790dec6916544c0f671e80c0288c8   324735:
 970dc653be2a18c15b35d044d8dd930d16275c64 v: v3

---
 [refs]                                             | 2 +-
 trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 6bd39660c8c2..12c98e1d22a3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b7553423cde0cb49a35fabcb15f83688c01ce400
+refs/heads/master: 085b50186dff9dc551b54d09be0c21ec925e7fc7
diff --git a/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 42e5c5c495e0..81134d312ee3 100644
--- a/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/trunk/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -734,8 +734,7 @@ static void rtl8192_prepare_beacon(struct r8192_priv *priv)
 
 	ring = &priv->tx_ring[BEACON_QUEUE];
 	pskb = __skb_dequeue(&ring->queue);
-	if (pskb)
-		kfree_skb(pskb);
+	kfree_skb(pskb);
 
 	pnewskb = rtllib_get_beacon(priv->rtllib);
 	if (!pnewskb)