bluetooth: hci_h4p: remove faulty timeout handling

It was reported that it is only causing trouble.

Reported-by: Urja Rannikko <urjaman@gmail.com>

diff --git a/drivers/bluetooth/hci_h4p/core.c b/drivers/bluetooth/hci_h4p/core.c
index b7fd597..db4fcfc 100644 (file)
--- a/drivers/bluetooth/hci_h4p/core.c
+++ b/drivers/bluetooth/hci_h4p/core.c
@@ -355,11 +355,6 @@ static void hci_h4p_rx_tasklet(unsigned long data)
 
        NBT_DBG_TRANSFER("rx tasklet\n");
 
-       if (info->rx_skb != NULL && info->rx_timed_out) {
-               kfree_skb(info->rx_skb);
-               info->rx_skb = NULL;
-       }
-       info->rx_timed_out = 0;
        info->rx_calls++;
 
        while (hci_h4p_inb(info, UART_LSR) & UART_LSR_DR) {
@@ -469,15 +464,6 @@ static void hci_h4p_tx_tasklet(unsigned long data)
 
        NBT_DBG("tx %p %d bytes\n", skb, skb->len);
 
-       /* there hould be no rx in progress at this point */
-       if (info->rx_skb != NULL) {
-               dev_err(info->dev, "Receive timed out, %i done, %li left, "
-                       "LSR=%02x, IER=%02x\n", info->rx_skb->len + 1,
-                       info->rx_count, hci_h4p_inb(info, UART_LSR),
-                       hci_h4p_inb(info, UART_IER));
-               info->rx_timed_out = 1;
-       }
-
        /* Copy data to tx fifo */
        while (!(hci_h4p_inb(info, UART_OMAP_SSR) & UART_OMAP_SSR_TXFULL) &&
               (sent < skb->len)) {

diff --git a/drivers/bluetooth/hci_h4p/hci_h4p.h b/drivers/bluetooth/hci_h4p/hci_h4p.h
index 86c2dfa..5c73f17 100644 (file)
--- a/drivers/bluetooth/hci_h4p/hci_h4p.h
+++ b/drivers/bluetooth/hci_h4p/hci_h4p.h
@@ -89,7 +89,6 @@ struct hci_h4p_info {
        int fw_error;
        int init_error;
 
-       int rx_timed_out;
        int rx_calls;
 
        struct sk_buff_head txq;