Commit ca17a5cc authored by Tim Jiang's avatar Tim Jiang Committed by Marcel Holtmann
Browse files

Bluetooth: btusb: use default nvm if boardID is 0 for wcn6855. 



if boardID is 0, will use the default nvm file without surfix.

Signed-off-by: default avatarTim Jiang <tjiang@codeaurora.org>
Signed-off-by: default avatarMarcel Holtmann <marcel@holtmann.org>
parent a1b2fdf9

drivers/bluetooth/btusb.c

+9 −3
Original line number Diff line number Diff line
@@ -4172,9 +4172,15 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev, 
	int err;



	if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {

		/* if boardid equal 0, use default nvm without surfix */

		if (le16_to_cpu(ver->board_id) == 0x0) {

			snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",

				 le32_to_cpu(ver->rom_version));

		} else {

			snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",

				le32_to_cpu(ver->rom_version),

				le16_to_cpu(ver->board_id));

		}

	} else {

		snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x.bin",

			 le32_to_cpu(ver->rom_version));