diff options
| author | David S. Miller | 2018-08-13 20:38:54 +0200 |
|---|---|---|
| committer | David S. Miller | 2018-08-13 20:38:54 +0200 |
| commit | bb2a0812eb784c3361ae4bbf7bd4d30a062bb2d8 (patch) | |
| tree | 5fdb70e67f1bdc70a6f03d645f2c1ef3e5a94a0b | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next (diff) | |
| parent | Bluetooth: mediatek: pass correct size to h4_recv_buf() (diff) | |
| download | kernel-qcow2-linux-bb2a0812eb784c3361ae4bbf7bd4d30a062bb2d8.tar.gz kernel-qcow2-linux-bb2a0812eb784c3361ae4bbf7bd4d30a062bb2d8.tar.xz kernel-qcow2-linux-bb2a0812eb784c3361ae4bbf7bd4d30a062bb2d8.zip | |
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>
| -rw-r--r-- | drivers/bluetooth/btmtkuart.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/bluetooth/btmtkuart.c b/drivers/bluetooth/btmtkuart.c index e0571fe04d00..ed2a5c7cb77f 100644 --- a/drivers/bluetooth/btmtkuart.c +++ b/drivers/bluetooth/btmtkuart.c @@ -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, sz_h4, mtk_recv_pkts, - sizeof(mtk_recv_pkts)); + ARRAY_SIZE(mtk_recv_pkts)); if (IS_ERR(bdev->rx_skb)) { err = PTR_ERR(bdev->rx_skb); bt_dev_err(bdev->hdev, |