Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

[pandora-kernel.git] / drivers / bluetooth / hci_h4.c

diff --git a/drivers/bluetooth/hci_h4.c b/drivers/bluetooth/hci_h4.c
index bfbae14..c0ce813 100644 (file)
--- a/drivers/bluetooth/hci_h4.c
+++ b/drivers/bluetooth/hci_h4.c
@@ -46,11 +46,6 @@
 
 #include "hci_uart.h"
 
-#ifndef CONFIG_BT_HCIUART_DEBUG
-#undef  BT_DBG
-#define BT_DBG( A... )
-#endif
-
 #define VERSION "1.2"
 
 struct h4_struct {
@@ -107,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);