diff options
author | David S. Miller | 2018-05-21 00:24:22 +0200 |
---|---|---|
committer | David S. Miller | 2018-05-21 00:24:22 +0200 |
commit | 2c71ab4bb465c79a4687cc2fd5012e470aebdb1f (patch) | |
tree | be9407da61256ff3cc17219f2f8acc45297bfdd0 /drivers/bluetooth/hci_ldisc.c | |
parent | Revert "ixgbe: release lock for the duration of ixgbe_suspend_close()" (diff) | |
parent | Bluetooth: Add a new 13d3:3496 QCA_ROME device (diff) | |
download | kernel-qcow2-linux-2c71ab4bb465c79a4687cc2fd5012e470aebdb1f.tar.gz kernel-qcow2-linux-2c71ab4bb465c79a4687cc2fd5012e470aebdb1f.tar.xz kernel-qcow2-linux-2c71ab4bb465c79a4687cc2fd5012e470aebdb1f.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-05-18
Here's the first bluetooth-next pull request for the 4.18 kernel:
- Refactoring of the btbcm driver
- New USB IDs for QCA_ROME and LiteOn controllers
- Buffer overflow fix if the controller sends invalid advertising data length
- Various cleanups & fixes for Qualcomm controllers
Please let me know if there are any issues pulling. Thanks.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/bluetooth/hci_ldisc.c')
-rw-r--r-- | drivers/bluetooth/hci_ldisc.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index b6a71705b7d6..954213e5daa5 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -447,6 +447,8 @@ static int hci_uart_setup(struct hci_dev *hdev) btbcm_check_bdaddr(hdev); break; #endif + default: + break; } done: |