2 files changed, 10 insertions, 3 deletions

diff --git a/drivers/bluetooth/hci_ath.c b/drivers/bluetooth/hci_ath.c
index bd34406faaae..4093935ddf42 100644
--- a/drivers/bluetooth/hci_ath.c
+++ b/drivers/bluetooth/hci_ath.c
@@ -201,8 +201,13 @@ static struct sk_buff *ath_dequeue(struct hci_uart *hu)
 /* Recv data */
 static int ath_recv(struct hci_uart *hu, void *data, int count)
 {
-        if (hci_recv_stream_fragment(hu->hdev, data, count) < 0)
+        int ret;
+
+        ret = hci_recv_stream_fragment(hu->hdev, data, count);
+        if (ret < 0) {
                 BT_ERR("Frame Reassembly Failed");
+                return ret;
+        }
 
         return count;
 }
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 48ad2a7ab080..320f71803a2b 100644
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -359,6 +359,7 @@ static void hci_uart_tty_wakeup(struct tty_struct *tty)
  */
 static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *flags, int count)
 {
+        int ret;
         struct hci_uart *hu = (void *)tty->disc_data;
 
         if (!hu || tty != hu->tty)
@@ -368,8 +369,9 @@ static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *f
                 return;
 
         spin_lock(&hu->rx_lock);
-        hu->proto->recv(hu, (void *) data, count);
-        hu->hdev->stat.byte_rx += count;
+        ret = hu->proto->recv(hu, (void *) data, count);
+        if (ret > 0)
+                hu->hdev->stat.byte_rx += count;
         spin_unlock(&hu->rx_lock);
 
         tty_unthrottle(tty);