diff options
| author | David S. Miller | 2019-07-07 21:54:36 +0200 |
|---|---|---|
| committer | David S. Miller | 2019-07-07 21:54:36 +0200 |
| commit | f7623d340794620ac8d933477cc265be77c78fe5 (patch) | |
| tree | 35ed950eb5fcfbaf17d5532d0ddde4a0ad8a2840 /drivers/bluetooth/hci_ldisc.c | |
| parent | Merge tag 'wireless-drivers-next-for-davem-2019-07-06' of git://git.kernel.or... (diff) | |
| parent | Bluetooth: btusb: Add protocol support for MediaTek MT7663U USB devices (diff) | |
| download | kernel-qcow2-linux-f7623d340794620ac8d933477cc265be77c78fe5.tar.gz kernel-qcow2-linux-f7623d340794620ac8d933477cc265be77c78fe5.tar.xz kernel-qcow2-linux-f7623d340794620ac8d933477cc265be77c78fe5.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 2019-07-07
Here's the main bluetooth-next pull request for 5.3:
- Added support for new devices from Qualcomm, Realtek and Broadcom and
MediaTek
- Various fixes to 6LoWPAN
- Fix L2CAP PSM namespace separation for LE & BR/EDR
- Fix behavior with Microsoft Surface Precision Mouse
- Added support for LE Ping feature
- Fix L2CAP Disconnect response handling if received in wrong state
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 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/drivers/bluetooth/hci_ldisc.c b/drivers/bluetooth/hci_ldisc.c index c84f985f348d..8950e07889fe 100644 --- a/drivers/bluetooth/hci_ldisc.c +++ b/drivers/bluetooth/hci_ldisc.c @@ -178,6 +178,7 @@ restart: goto restart; clear_bit(HCI_UART_SENDING, &hu->tx_state); + wake_up_bit(&hu->tx_state, HCI_UART_SENDING); } void hci_uart_init_work(struct work_struct *work) @@ -213,6 +214,13 @@ int hci_uart_init_ready(struct hci_uart *hu) return 0; } +int hci_uart_wait_until_sent(struct hci_uart *hu) +{ + return wait_on_bit_timeout(&hu->tx_state, HCI_UART_SENDING, + TASK_INTERRUPTIBLE, + msecs_to_jiffies(2000)); +} + /* ------- Interface to HCI layer ------ */ /* Reset device */ static int hci_uart_flush(struct hci_dev *hdev) |