Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty-2.6

[firefly-linux-kernel-4.4.55.git] / drivers / bluetooth / hci_ldisc.c

diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c
index 0d4da5e14ba05045650fcead1516bdc4450a986c..b3f01996318f04c0f432a38112226dbbeba0efcf 100644 (file)
--- a/drivers/bluetooth/hci_ldisc.c
+++ b/drivers/bluetooth/hci_ldisc.c
@@ -355,7 +355,7 @@ static void hci_uart_tty_wakeup(struct tty_struct *tty)
  *             flags        pointer to flags for data
  *             count        count of received data in bytes
  *     
- * Return Value:    None
+ * Return Value:    Number of bytes received
  */
 static unsigned int hci_uart_tty_receive(struct tty_struct *tty,
                const u8 *data, char *flags, int count)
@@ -371,7 +371,8 @@ static unsigned int hci_uart_tty_receive(struct tty_struct *tty,
 
        spin_lock(&hu->rx_lock);
        received = hu->proto->recv(hu, (void *) data, count);
-       hu->hdev->stat.byte_rx += count;
+       if (received > 0)
+               hu->hdev->stat.byte_rx += received;
        spin_unlock(&hu->rx_lock);
 
        tty_unthrottle(tty);