Commit bb2a0812 authored Aug 13, 2018 by David S. Miller

Merge branch 'for-upstream' of...

Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next



Johan Hedberg says:

====================
pull request: bluetooth-next 2018-08-13

There was one pretty bad bug that slipped into the MediaTek HCI driver
in the last bluetooth-next pull request. Would it be possible to get
this one-liner fix pulled to net-next before you make your first 4.19
pull request for Linus? Thanks.
====================

Signed-off-by: David S. Miller <davem@davemloft.net>

parents c1617fb4 330ad75f

drivers/bluetooth/btmtkuart.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -346,7 +346,7 @@ static int btmtkuart_recv(struct hci_dev hdev, const u8 data, size_t count)

	bdev->rx_skb = h4_recv_buf(bdev->hdev, bdev->rx_skb, p_h4,		bdev->rx_skb = h4_recv_buf(bdev->hdev, bdev->rx_skb, p_h4,
	sz_h4, mtk_recv_pkts,		sz_h4, mtk_recv_pkts,
	sizeof(mtk_recv_pkts));		ARRAY_SIZE(mtk_recv_pkts));
	if (IS_ERR(bdev->rx_skb)) {		if (IS_ERR(bdev->rx_skb)) {
	err = PTR_ERR(bdev->rx_skb);		err = PTR_ERR(bdev->rx_skb);
	bt_dev_err(bdev->hdev,		bt_dev_err(bdev->hdev,