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>

diff --git a/drivers/bluetooth/btmtk.c b/drivers/bluetooth/btmtk.c
index 224eafc27dbea95ed5ae1229b4e245071ea10c7e..68846c5bd4f794442436937f295766cbab625ca4 100644 (file)
--- 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);