Prechádzať zdrojové kódy

Bluetooth: hci_uart: check the return value of recv()

Check the return value of hu->proto->recv() in hci_uart_tty_receive()
the recv() may return error, check it, not add this to statistics.

Signed-off-by: Jiejing Zhang <jiejing.zhang@freescale.com>
Signed-off-by: Gustavo F. Padovan <padovan@profusion.mobi>
Jiejing Zhang 14 rokov pred
rodič
commit
78b4a56c28

+ 6 - 1
drivers/bluetooth/hci_ath.c

@@ -201,8 +201,13 @@ static struct sk_buff *ath_dequeue(struct hci_uart *hu)
 /* Recv data */
 /* Recv data */
 static int ath_recv(struct hci_uart *hu, void *data, int count)
 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");
 		BT_ERR("Frame Reassembly Failed");
+		return ret;
+	}
 
 
 	return count;
 	return count;
 }
 }

+ 4 - 2
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)
 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;
 	struct hci_uart *hu = (void *)tty->disc_data;
 
 
 	if (!hu || tty != hu->tty)
 	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;
 		return;
 
 
 	spin_lock(&hu->rx_lock);
 	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);
 	spin_unlock(&hu->rx_lock);
 
 
 	tty_unthrottle(tty);
 	tty_unthrottle(tty);