]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
Bluetooth: btmtk: Fix wait_on_bit_timeout interruption during shutdown
authorJiande Lu <jiande.lu@mediatek.com>
Thu, 24 Jul 2025 08:51:17 +0000 (16:51 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 28 Aug 2025 14:34:45 +0000 (16:34 +0200)
[ Upstream commit 099799fa9b76c5c02b49e07005a85117a25b01ea ]

During the shutdown process, an interrupt occurs that
prematurely terminates the wait for the expected event.
This change replaces TASK_INTERRUPTIBLE with
TASK_UNINTERRUPTIBLE in the wait_on_bit_timeout call to ensure
the shutdown process completes as intended without being
interrupted by signals.

Fixes: d019930b0049 ("Bluetooth: btmtk: move btusb_mtk_hci_wmt_sync to btmtk.c")
Signed-off-by: Jiande Lu <jiande.lu@mediatek.com>
Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/bluetooth/btmtk.c

index 4390fd571dbd15f10879e810479bdde122b4a8fa..a8c520dc09e19c9d2b1a03780b7df3348a19fa55 100644 (file)
@@ -642,12 +642,7 @@ static int btmtk_usb_hci_wmt_sync(struct hci_dev *hdev,
         * WMT command.
         */
        err = wait_on_bit_timeout(&data->flags, BTMTK_TX_WAIT_VND_EVT,
-                                 TASK_INTERRUPTIBLE, HCI_INIT_TIMEOUT);
-       if (err == -EINTR) {
-               bt_dev_err(hdev, "Execution of wmt command interrupted");
-               clear_bit(BTMTK_TX_WAIT_VND_EVT, &data->flags);
-               goto err_free_wc;
-       }
+                                 TASK_UNINTERRUPTIBLE, HCI_INIT_TIMEOUT);
 
        if (err) {
                bt_dev_err(hdev, "Execution of wmt command timed out");