Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ae82f3b authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "cnss2: Always use firmware_request_nowarn() to load binaries"

parents 284fe2e9 f06b3088

drivers/net/wireless/cnss2/main.c

+2 −2
Original line number Diff line number Diff line
@@ -2504,7 +2504,7 @@ int cnss_request_firmware_direct(struct cnss_plat_data *plat_priv, 
		return request_firmware_direct(fw_entry, filename,

					       &plat_priv->plat_dev->dev);

	else

		return request_firmware(fw_entry, filename,

		return firmware_request_nowarn(fw_entry, filename,

					       &plat_priv->plat_dev->dev);

}

drivers/net/wireless/cnss2/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -3931,7 +3931,7 @@ int cnss_pci_load_m3(struct cnss_pci_data *pci_priv) 
		cnss_pci_add_fw_prefix_name(pci_priv, filename,

					    DEFAULT_M3_FILE_NAME);



		ret = request_firmware(&fw_entry, filename,

		ret = firmware_request_nowarn(&fw_entry, filename,

					      &pci_priv->pci_dev->dev);

		if (ret) {

			cnss_pr_err("Failed to load M3 image: %s\n", filename);

drivers/net/wireless/cnss2/qmi.c

+2 −2
Original line number Diff line number Diff line
@@ -606,7 +606,7 @@ int cnss_wlfw_bdf_dnld_send_sync(struct cnss_plat_data *plat_priv, 
		ret = cnss_request_firmware_direct(plat_priv, &fw_entry,

						   filename);

	else

		ret = request_firmware(&fw_entry, filename,

		ret = firmware_request_nowarn(&fw_entry, filename,

					      &plat_priv->plat_dev->dev);



	if (ret) {