Skip to content

Commit 33634e2

Browse files
Hao QinVudentz
authored andcommitted
Bluetooth: btmtk: Remove the resetting step before downloading the fw
Remove the resetting step before downloading the fw, as it may cause other usb devices to fail to initialise when connected during boot on kernels 6.11 and newer. Signed-off-by: Hao Qin <hao.qin@mediatek.com> Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
1 parent bdbcd52 commit 33634e2

1 file changed

Lines changed: 0 additions & 10 deletions

File tree

drivers/bluetooth/btmtk.c

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1330,13 +1330,6 @@ int btmtk_usb_setup(struct hci_dev *hdev)
13301330
break;
13311331
case 0x7922:
13321332
case 0x7925:
1333-
/* Reset the device to ensure it's in the initial state before
1334-
* downloading the firmware to ensure.
1335-
*/
1336-
1337-
if (!test_bit(BTMTK_FIRMWARE_LOADED, &btmtk_data->flags))
1338-
btmtk_usb_subsys_reset(hdev, dev_id);
1339-
fallthrough;
13401333
case 0x7961:
13411334
btmtk_fw_get_filename(fw_bin_name, sizeof(fw_bin_name), dev_id,
13421335
fw_version, fw_flavor);
@@ -1345,12 +1338,9 @@ int btmtk_usb_setup(struct hci_dev *hdev)
13451338
btmtk_usb_hci_wmt_sync);
13461339
if (err < 0) {
13471340
bt_dev_err(hdev, "Failed to set up firmware (%d)", err);
1348-
clear_bit(BTMTK_FIRMWARE_LOADED, &btmtk_data->flags);
13491341
return err;
13501342
}
13511343

1352-
set_bit(BTMTK_FIRMWARE_LOADED, &btmtk_data->flags);
1353-
13541344
/* It's Device EndPoint Reset Option Register */
13551345
err = btmtk_usb_uhw_reg_write(hdev, MTK_EP_RST_OPT,
13561346
MTK_EP_RST_IN_OUT_OPT);

0 commit comments

Comments
 (0)