From bf8c440c83b3cf3fc6b36b2f446efe82bc63da64 Mon Sep 17 00:00:00 2001
From: Wei Yongjun <yjwei@cn.fujitsu.com>
Date: Wed, 25 Feb 2009 18:09:33 +0800
Subject: [PATCH] --- yaml --- r: 134747 b: refs/heads/master c:
 b1fb06830dc870d862f7f80e276130c0ab84d59f h: refs/heads/master i:   134745:
 82378549d4da57043e5d3f92b50a6a38e949818d   134743:
 76a9b79f7348124b12318df3bba3e108dc8b3356 v: v3

---
 [refs]                           | 2 +-
 trunk/drivers/bluetooth/bfusb.c  | 3 +--
 trunk/drivers/bluetooth/hci_h4.c | 3 +--
 trunk/drivers/bluetooth/hci_ll.c | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index f0251ddf5e02..1dc98d9ee629 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7585b97a48180f754ebdade1be94092e36bef365
+refs/heads/master: b1fb06830dc870d862f7f80e276130c0ab84d59f
diff --git a/trunk/drivers/bluetooth/bfusb.c b/trunk/drivers/bluetooth/bfusb.c
index d3f14bee0f19..2a00707aba3b 100644
--- a/trunk/drivers/bluetooth/bfusb.c
+++ b/trunk/drivers/bluetooth/bfusb.c
@@ -257,8 +257,7 @@ static inline int bfusb_recv_block(struct bfusb_data *data, int hdr, unsigned ch
 
 	if (hdr & 0x10) {
 		BT_ERR("%s error in block", data->hdev->name);
-		if (data->reassembly)
-			kfree_skb(data->reassembly);
+		kfree_skb(data->reassembly);
 		data->reassembly = NULL;
 		return -EIO;
 	}
diff --git a/trunk/drivers/bluetooth/hci_h4.c b/trunk/drivers/bluetooth/hci_h4.c
index b0fafb055996..c0ce8134814e 100644
--- a/trunk/drivers/bluetooth/hci_h4.c
+++ b/trunk/drivers/bluetooth/hci_h4.c
@@ -102,8 +102,7 @@ static int h4_close(struct hci_uart *hu)
 
 	skb_queue_purge(&h4->txq);
 
-	if (h4->rx_skb)
-		kfree_skb(h4->rx_skb);
+	kfree_skb(h4->rx_skb);
 
 	hu->priv = NULL;
 	kfree(h4);
diff --git a/trunk/drivers/bluetooth/hci_ll.c b/trunk/drivers/bluetooth/hci_ll.c
index b91d45a41b2f..5c65014635be 100644
--- a/trunk/drivers/bluetooth/hci_ll.c
+++ b/trunk/drivers/bluetooth/hci_ll.c
@@ -163,8 +163,7 @@ static int ll_close(struct hci_uart *hu)
 	skb_queue_purge(&ll->tx_wait_q);
 	skb_queue_purge(&ll->txq);
 
-	if (ll->rx_skb)
-		kfree_skb(ll->rx_skb);
+	kfree_skb(ll->rx_skb);
 
 	hu->priv = NULL;