Eric Lee / linux-smarc-t335x-v3.2

Download as
Browse Code ยป

Commit 78b4a56c28c096a1eb02f1d864eb450eb910e43d

Authored by Jiejing Zhang
Committed by Gustavo F. Padovan
1 parent e1ba1f1546
Exists in master and in 4 other branches v3.2_AM335xPSP_04.06.00.11, v3.2_NEWT335xPSP_04.06.00.11, v3.2_SBC_SMARTMEN, v3.2_SMARCT335xPSP_04.06.00.11

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>

Showing 2 changed files with 10 additions and 3 deletions Side-by-side Diff

drivers/bluetooth/hci_ath.c
Diff comments   View file @ 78b4a56
... ... @@ -201,8 +201,13 @@
201 201 /* Recv data */
202 202 static int ath_recv(struct hci_uart *hu, void *data, int count)
203 203 {
204   - if (hci_recv_stream_fragment(hu->hdev, data, count) < 0)
  204 + int ret;
  205 +
  206 + ret = hci_recv_stream_fragment(hu->hdev, data, count);
  207 + if (ret < 0) {
205 208 BT_ERR("Frame Reassembly Failed");
  209 + return ret;
  210 + }
206 211  
207 212 return count;
208 213 }
drivers/bluetooth/hci_ldisc.c
Diff comments   View file @ 78b4a56
... ... @@ -359,6 +359,7 @@
359 359 */
360 360 static void hci_uart_tty_receive(struct tty_struct *tty, const u8 *data, char *flags, int count)
361 361 {
  362 + int ret;
362 363 struct hci_uart *hu = (void *)tty->disc_data;
363 364  
364 365 if (!hu || tty != hu->tty)
... ... @@ -368,8 +369,9 @@
368 369 return;
369 370  
370 371 spin_lock(&hu->rx_lock);
371   - hu->proto->recv(hu, (void *) data, count);
372   - hu->hdev->stat.byte_rx += count;
  372 + ret = hu->proto->recv(hu, (void *) data, count);
  373 + if (ret > 0)
  374 + hu->hdev->stat.byte_rx += count;
373 375 spin_unlock(&hu->rx_lock);
374 376  
375 377 tty_unthrottle(tty);