To avoid the firmware loading race between Bluetooth and WiFi on Intel 8260, load firmware exclusively when IWLWIFI is enabled.
Signed-off-by: Kai-Heng Feng <[email protected]> --- drivers/bluetooth/btusb.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c index 61cde1a7ec1b..060e3c6482f4 100644 --- a/drivers/bluetooth/btusb.c +++ b/drivers/bluetooth/btusb.c @@ -2251,8 +2251,16 @@ static int btusb_setup_intel_new(struct hci_dev *hdev) set_bit(BTUSB_DOWNLOADING, &data->flags); +#if IS_ENABLED(CONFIG_IWLWIFI) + btintel_firmware_lock(); +#endif + /* Start firmware downloading and get boot parameter */ err = btintel_download_firmware(hdev, fw, &boot_param); + +#if IS_ENABLED(CONFIG_IWLWIFI) + btintel_firmware_unlock(); +#endif if (err < 0) goto done; -- 2.17.1
