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

[ Upstream commit ca17a5cccf8b6d35dab4729bea8f4350bc0b4caf ]

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

Signed-off-by: Tim Jiang <tjiang@codeaurora.org>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/bluetooth/btusb.c b/drivers/bluetooth/btusb.c
index ec17772defc2a3775d91ac62c45dd982b27b8f1c..64b0e68c68ebf81b8c53736412f44d3f7edcb5b0 100644 (file)
--- a/drivers/bluetooth/btusb.c
+++ b/drivers/bluetooth/btusb.c
@@ -4228,9 +4228,15 @@ static int btusb_setup_qca_load_nvm(struct hci_dev *hdev,
        int err;
 
        if (((ver->flag >> 8) & 0xff) == QCA_FLAG_MULTI_NVM) {
-               snprintf(fwname, sizeof(fwname), "qca/nvm_usb_%08x_%04x.bin",
-                        le32_to_cpu(ver->rom_version),
-                        le16_to_cpu(ver->board_id));
+               /* 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));