From 794a26588dd546b64adb1fb832cb632806dffcca Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yongjun_wei@trendmicro.com.cn>
Date: Tue, 28 Aug 2012 21:12:48 +0800
Subject: [PATCH] --- yaml --- r: 328192 b: refs/heads/master c:
 7923296f3f9eebbe3d7bb4c99d73bd7a226e0146 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index c9147fe09609..77cf12339bdd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9712ba0bec83579ae63e4d61f79e18c7d0d9d3fd
+refs/heads/master: 7923296f3f9eebbe3d7bb4c99d73bd7a226e0146
diff --git a/trunk/drivers/bluetooth/btmrvl_sdio.c b/trunk/drivers/bluetooth/btmrvl_sdio.c
index 03b3acba6143..3f4bfc814dc7 100644
--- a/trunk/drivers/bluetooth/btmrvl_sdio.c
+++ b/trunk/drivers/bluetooth/btmrvl_sdio.c
@@ -600,8 +600,7 @@ static int btmrvl_sdio_card_to_host(struct btmrvl_private *priv)
 exit:
 	if (ret) {
 		hdev->stat.err_rx++;
-		if (skb)
-			kfree_skb(skb);
+		kfree_skb(skb);
 	}
 
 	return ret;