Skip to content

Commit 64057f0

Browse files
dolciniVudentz
authored andcommitted
Bluetooth: btmtkuart: fix recv_buf() return value
Serdev recv_buf() callback is supposed to return the amount of bytes consumed, therefore an int in between 0 and count. Do not return negative number in case of issue, just print an error and return count. This fixes a WARN in ttyport_receive_buf(). Link: https://lore.kernel.org/all/[email protected]/ Fixes: 7237c4c ("Bluetooth: mediatek: Add protocol support for MediaTek serial devices") Signed-off-by: Francesco Dolcini <[email protected]> Signed-off-by: Luiz Augusto von Dentz <[email protected]>
1 parent 94d0539 commit 64057f0

File tree

1 file changed

+3
-8
lines changed

1 file changed

+3
-8
lines changed

drivers/bluetooth/btmtkuart.c

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -336,7 +336,7 @@ mtk_stp_split(struct btmtkuart_dev *bdev, const unsigned char *data, int count,
336336
return data;
337337
}
338338

339-
static int btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count)
339+
static void btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count)
340340
{
341341
struct btmtkuart_dev *bdev = hci_get_drvdata(hdev);
342342
const unsigned char *p_left = data, *p_h4;
@@ -375,25 +375,20 @@ static int btmtkuart_recv(struct hci_dev *hdev, const u8 *data, size_t count)
375375
bt_dev_err(bdev->hdev,
376376
"Frame reassembly failed (%d)", err);
377377
bdev->rx_skb = NULL;
378-
return err;
378+
return;
379379
}
380380

381381
sz_left -= sz_h4;
382382
p_left += sz_h4;
383383
}
384-
385-
return 0;
386384
}
387385

388386
static int btmtkuart_receive_buf(struct serdev_device *serdev, const u8 *data,
389387
size_t count)
390388
{
391389
struct btmtkuart_dev *bdev = serdev_device_get_drvdata(serdev);
392-
int err;
393390

394-
err = btmtkuart_recv(bdev->hdev, data, count);
395-
if (err < 0)
396-
return err;
391+
btmtkuart_recv(bdev->hdev, data, count);
397392

398393
bdev->hdev->stat.byte_rx += count;
399394

0 commit comments

Comments
 (0)