A-Team_Digital_Solutions/android_kernel_motorola_sm6375
Watch
2
0
Fork
You've already forked android_kernel_motorola_sm6375
 0
mirror of https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git synced 2026-10-13 08:07:32 -04:00
Code Issues Projects Releases Packages Wiki Activity

Revert "qcacld-3.0: request firmware without userhelper"

Browse source 
This reverts change-id Ie40db69a24dc1e0b86f140ca1aad91bd3b10e95e.

The reverted changes was causing regression, that optional
firmware not loadable even it exists.

Change-Id: I02a45e9be635e4ce0787f0a24480e42129c59874
CRs-Fixed: 2516015
This commit is contained in:
Lin Bai 2019-08-28 20:25:13 -07:00 • committed by nshrivas
commit 8862bf7d81
2 changed files with 7 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

7
core/bmi/src/ol_fw.c
View file

@ -308,10 +308,9 @@ __ol_transfer_bin_file(struct ol_context *ol_ctx, enum ATH_BIN_FILE file,
if (bd_id_filename[i]) {
BMI_DBG("%s: Trying to load %s",
__func__, bd_id_filename[i]);
status = request_firmware_direct(
&fw_entry,
bd_id_filename[i],
qdf_dev->dev);
status = request_firmware(&fw_entry,
bd_id_filename[i],
qdf_dev->dev);
if (!status)
break;
BMI_ERR("%s: Failed to get %s:%d",

11
core/hdd/src/wlan_hdd_cfg.c
View file

@ -239,16 +239,13 @@ QDF_STATUS hdd_update_mac_config(struct hdd_context *hdd_ctx)
QDF_STATUS qdf_status = QDF_STATUS_SUCCESS;
memset(mac_table, 0, sizeof(mac_table));
status = request_firmware_direct(&fw,
WLAN_MAC_FILE,
hdd_ctx->parent_dev);
status = request_firmware(&fw, WLAN_MAC_FILE, hdd_ctx->parent_dev);
if (status) {
/*
* request_firmware_direct "fails" if the file is not found,
* which is a valid setup for us, so log using debug instead
* of error
* request_firmware "fails" if the file is not found, which is a
* valid setup for us, so log using debug instead of error
*/
hdd_debug("request_firmware_direct failed; status:%d", status);
hdd_debug("request_firmware failed; status:%d", status);
return QDF_STATUS_E_FAILURE;
}