vserver 1.9.5.x5

[linux-2.6.git] / drivers / bluetooth / hci_bcsp.c

diff --git a/drivers/bluetooth/hci_bcsp.c b/drivers/bluetooth/hci_bcsp.c
index 60e01f5..846cdff 100644 (file)
--- a/drivers/bluetooth/hci_bcsp.c
+++ b/drivers/bluetooth/hci_bcsp.c
@@ -33,7 +33,6 @@
 #include <linux/config.h>
 #include <linux/module.h>
 
-#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/sched.h>
@@ -266,7 +265,7 @@ static struct sk_buff *bcsp_prepare_pkt(struct bcsp_struct *bcsp, u8 *data,
 /* This is a rewrite of pkt_avail in ABCSP */
 static struct sk_buff *bcsp_dequeue(struct hci_uart *hu)
 {
-       struct bcsp_struct *bcsp = (struct bcsp_struct *) hu->priv;
+       struct bcsp_struct *bcsp = hu->priv;
        unsigned long flags;
        struct sk_buff *skb;
        
@@ -630,11 +629,12 @@ static int bcsp_recv(struct hci_uart *hu, void *data, int count)
 static void bcsp_timed_event(unsigned long arg)
 {
        struct hci_uart *hu = (struct hci_uart *) arg;
-       struct bcsp_struct *bcsp = (struct bcsp_struct *) hu->priv;
+       struct bcsp_struct *bcsp = hu->priv;
        struct sk_buff *skb;
        unsigned long flags;
 
-       BT_ERR("Timeout, retransmitting %u pkts", bcsp->unack.qlen);
+       BT_DBG("hu %p retransmitting %u pkts", hu, bcsp->unack.qlen);
+
        spin_lock_irqsave(&bcsp->unack.lock, flags);
 
        while ((skb = __skb_dequeue_tail(&bcsp->unack)) != NULL) {