diff options
| author | Joel Stanley <joel@jms.id.au> | 2019-05-08 16:48:45 +0300 |
|---|---|---|
| committer | Joel Stanley <joel@jms.id.au> | 2019-05-08 16:48:48 +0300 |
| commit | d09fc0c4bdfbcbe251df247b5a94e2a07dec9c2f (patch) | |
| tree | 893d98100d3ede2ff76905a67e1b9798c8c88868 /drivers/bluetooth/btmtkuart.c | |
| parent | 76cc3bd0c342199b0bc0fd6afc7035274bf7a718 (diff) | |
| parent | 274ede3e1a5fb3d0fd33acafb08993e95972c51f (diff) | |
| download | linux-dev-5.0.tar.xz | |
Merge tag 'v5.0.14' into dev-5.0dev-5.0
This is the 5.0.14 stable release
Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'drivers/bluetooth/btmtkuart.c')
| -rw-r--r-- | drivers/bluetooth/btmtkuart.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/bluetooth/btmtkuart.c b/drivers/bluetooth/btmtkuart.c index 4593baff2bc9..19eecf198321 100644 --- a/drivers/bluetooth/btmtkuart.c +++ b/drivers/bluetooth/btmtkuart.c @@ -115,11 +115,13 @@ static int mtk_hci_wmt_sync(struct hci_dev *hdev, u8 op, u8 flag, u16 plen, TASK_INTERRUPTIBLE, HCI_INIT_TIMEOUT); if (err == -EINTR) { bt_dev_err(hdev, "Execution of wmt command interrupted"); + clear_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state); return err; } if (err) { bt_dev_err(hdev, "Execution of wmt command timed out"); + clear_bit(BTMTKUART_TX_WAIT_VND_EVT, &bdev->tx_state); return -ETIMEDOUT; } |