]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Bluetooth: btusb: Use firmware_request_nowarn
authorLuiz Augusto von Dentz <luiz.von.dentz@intel.com>
Thu, 13 May 2021 23:04:22 +0000 (16:04 -0700)
committerMarcel Holtmann <marcel@holtmann.org>
Thu, 20 May 2021 15:22:04 +0000 (17:22 +0200)
This replaces the use of request_firmware to firmware_request_nowarn
when firmware is optional (firmware is already operational).

Signed-off-by: Luiz Augusto von Dentz <luiz.von.dentz@intel.com>
Signed-off-by: Marcel Holtmann <marcel@holtmann.org>
drivers/bluetooth/btusb.c

index 31e74271cf8014ae6a5bd281bbbcc3ae5bb97d25..626a140e0ddc60ec04b66511b1aaa3a82d797c12 100644 (file)
@@ -2534,7 +2534,7 @@ static int btusb_intel_download_firmware_newgen(struct hci_dev *hdev,
        }
 
        btusb_setup_intel_newgen_get_fw_name(ver, fwname, sizeof(fwname), "sfi");
-       err = request_firmware(&fw, fwname, &hdev->dev);
+       err = firmware_request_nowarn(&fw, fwname, &hdev->dev);
        if (err < 0) {
                if (!test_bit(BTUSB_BOOTLOADER, &data->flags)) {
                        /* Firmware has already been loaded */
@@ -2704,7 +2704,7 @@ download:
                return -EINVAL;
        }
 
-       err = request_firmware(&fw, fwname, &hdev->dev);
+       err = firmware_request_nowarn(&fw, fwname, &hdev->dev);
        if (err < 0) {
                if (!test_bit(BTUSB_BOOTLOADER, &data->flags)) {
                        /* Firmware has already been loaded */