Commit 33634e2a authored by Hao Qin's avatar Hao Qin Committed by Luiz Augusto von Dentz
Browse files

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: default avatarHao Qin <hao.qin@mediatek.com>
Signed-off-by: default avatarLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
parent bdbcd528

drivers/bluetooth/btmtk.c

+0 −10
Original line number Diff line number Diff line
@@ -1330,13 +1330,6 @@ int btmtk_usb_setup(struct hci_dev *hdev) 
		break;

	case 0x7922:

	case 0x7925:

		/* Reset the device to ensure it's in the initial state before

		 * downloading the firmware to ensure.

		 */



		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);
@@ -1345,12 +1338,9 @@ int btmtk_usb_setup(struct hci_dev *hdev) 
						btmtk_usb_hci_wmt_sync);

		if (err < 0) {

			bt_dev_err(hdev, "Failed to set up firmware (%d)", err);

			clear_bit(BTMTK_FIRMWARE_LOADED, &btmtk_data->flags);

			return err;

		}



		set_bit(BTMTK_FIRMWARE_LOADED, &btmtk_data->flags);



		/* It's Device EndPoint Reset Option Register */

		err = btmtk_usb_uhw_reg_write(hdev, MTK_EP_RST_OPT,

					      MTK_EP_RST_IN_OUT_OPT);