aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorHao Qin <hao.qin@mediatek.com>2025-01-10 17:55:48 +0800
committerLuiz Augusto von Dentz <luiz.von.dentz@intel.com>2025-01-15 10:35:55 -0500
commita7208610761ae9b3bc109ddc493eb7c332fca5b2 (patch)
treea48b2ebbacdf4f4d89d8c38ab76d5505e7555301
parentBluetooth: L2CAP: handle NULL sock pointer in l2cap_sock_alloc (diff)
downloadwireguard-linux-a7208610761ae9b3bc109ddc493eb7c332fca5b2.tar.xz
wireguard-linux-a7208610761ae9b3bc109ddc493eb7c332fca5b2.zip
Bluetooth: btmtk: Remove resetting mt7921 before downloading the fw
Remove resetting mt7921 before downloading the fw, as it may cause command timeout when performing the reset. Signed-off-by: Hao Qin <hao.qin@mediatek.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
-rw-r--r--drivers/bluetooth/btmtk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
index 224eafc27dbe..68846c5bd4f7 100644
--- a/drivers/bluetooth/btmtk.c
+++ b/drivers/bluetooth/btmtk.c
@@ -1329,7 +1329,6 @@ int btmtk_usb_setup(struct hci_dev *hdev)
fwname = FIRMWARE_MT7668;
break;
case 0x7922:
- case 0x7961:
case 0x7925:
/* Reset the device to ensure it's in the initial state before
* downloading the firmware to ensure.
@@ -1337,7 +1336,8 @@ int btmtk_usb_setup(struct hci_dev *hdev)
if (!test_bit(BTMTK_FIRMWARE_LOADED, &btmtk_data->flags))
btmtk_usb_subsys_reset(hdev, dev_id);
-
+ fallthrough;
+ case 0x7961:
btmtk_fw_get_filename(fw_bin_name, sizeof(fw_bin_name), dev_id,
fw_version, fw_flavor);