Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8897bf03 authored by Sean Wang's avatar Sean Wang Committed by Greg Kroah-Hartman
Browse files

Bluetooth: mediatek: fix up an error path to restore bdev->tx_state 



commit 77f328dbc6cf42f22c691a164958a5452142a542 upstream.

Restore bdev->tx_state with clearing bit BTMTKUART_TX_WAIT_VND_EVT
when there is an error on waiting for the corresponding event.

Fixes: 7237c4c9 ("Bluetooth: mediatek: Add protocol support for MediaTek serial devices")
Signed-off-by: default avatarSean Wang <sean.wang@mediatek.com>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent f5ad05e6

drivers/bluetooth/btmtkuart.c

+2 −0
Original line number Diff line number Diff line
@@ -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;

	}