Skip to content

Commit

Permalink
Bluetooth: btusb: Update boot parameter specific to SKU
Browse files Browse the repository at this point in the history
boot parameter gets updated during firmware download process. Use the
updated boot parameter while doing soft reset of controller. This patch
fixes updating of boot parameter.

Signed-off-by: Kiran K <[email protected]>
Reviewed-by: Chethan T N <[email protected]>
Signed-off-by: Marcel Holtmann <[email protected]>
  • Loading branch information
kirankrishnappa authored and holtmann committed Aug 31, 2020
1 parent 3b79925 commit dc45d37
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/bluetooth/btusb.c
Original file line number Diff line number Diff line change
Expand Up @@ -2338,10 +2338,10 @@ static bool btusb_setup_intel_new_get_fw_name(struct intel_version *ver,

static int btusb_intel_download_firmware(struct hci_dev *hdev,
struct intel_version *ver,
struct intel_boot_params *params)
struct intel_boot_params *params,
u32 *boot_param)
{
const struct firmware *fw;
u32 boot_param;
char fwname[64];
int err;
struct btusb_data *data = hci_get_drvdata(hdev);
Expand Down Expand Up @@ -2479,7 +2479,7 @@ static int btusb_intel_download_firmware(struct hci_dev *hdev,
set_bit(BTUSB_DOWNLOADING, &data->flags);

/* Start firmware downloading and get boot parameter */
err = btintel_download_firmware(hdev, fw, &boot_param);
err = btintel_download_firmware(hdev, fw, boot_param);
if (err < 0) {
/* When FW download fails, send Intel Reset to retry
* FW download.
Expand Down Expand Up @@ -2561,7 +2561,7 @@ static int btusb_setup_intel_new(struct hci_dev *hdev)
return err;
}

err = btusb_intel_download_firmware(hdev, &ver, &params);
err = btusb_intel_download_firmware(hdev, &ver, &params, &boot_param);
if (err)
return err;

Expand Down

0 comments on commit dc45d37

Please sign in to comment.