diff options
| author | David S. Miller <davem@davemloft.net> | 2017-02-20 11:15:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2017-02-20 11:15:11 -0500 |
| commit | c1ceee5efe80a2f03071a39a7df19b69dee21eae (patch) | |
| tree | 9b7380022df59e983e22079ba0dc4eb7b20beab3 /drivers/bluetooth/btbcm.c | |
| parent | 24045a03b8796e3e1ddb370dfe4bc592a9f5f301 (diff) | |
| parent | 8f91566f99fab8f7a0d2728a1e3defb13675837a (diff) | |
Merge branch 'for-upstream' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next
Johan Hedberg says:
====================
pull request: bluetooth-next 2017-02-19
Here's a set of Bluetooth patches for the 4.11 kernel:
- New USB IDs to the btusb driver
- Race fix in btmrvl driver
- Added out-of-band wakeup support to the btusb driver
- NULL dereference fix to bt_sock_recvmsg
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/btbcm.c')
| -rw-r--r-- | drivers/bluetooth/btbcm.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/bluetooth/btbcm.c b/drivers/bluetooth/btbcm.c index fdb44829ab6f..ba3dd2eafc09 100644 --- a/drivers/bluetooth/btbcm.c +++ b/drivers/bluetooth/btbcm.c @@ -178,6 +178,9 @@ static int btbcm_reset(struct hci_dev *hdev) } kfree_skb(skb); + /* 100 msec delay for module to complete reset process */ + msleep(100); + return 0; } |