diff --git a/drivers/staging/qcacld-3.0/core/hdd/inc/wlan_hdd_misc.h b/drivers/staging/qcacld-3.0/core/hdd/inc/wlan_hdd_misc.h index 68e5dad91d6a..dea0aa26a91a 100644 --- a/drivers/staging/qcacld-3.0/core/hdd/inc/wlan_hdd_misc.h +++ b/drivers/staging/qcacld-3.0/core/hdd/inc/wlan_hdd_misc.h @@ -43,6 +43,7 @@ #ifdef MSM_PLATFORM #define WLAN_INI_FILE "wlan/qca_cld/qca6390/" PREFIX "WCNSS_qcom_cfg.ini" +#define WLAN_INI_FILE_DEFAULT "wlan/qca_cld/" PREFIX "WCNSS_qcom_cfg.ini" #define WLAN_MAC_FILE "wlan/qca_cld/" PREFIX "wlan_mac.bin" #else #define WLAN_INI_FILE "wlan/" PREFIX "qcom_cfg.ini" diff --git a/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_main.c b/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_main.c index 8c5f2f358672..b5379fd44dba 100644 --- a/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_main.c +++ b/drivers/staging/qcacld-3.0/core/hdd/src/wlan_hdd_main.c @@ -11650,6 +11650,10 @@ struct hdd_context *hdd_context_create(struct device *dev) } status = cfg_parse(WLAN_INI_FILE); + if (!QDF_IS_STATUS_ERROR(status)) + goto cfg_exit; + + status = cfg_parse(WLAN_INI_FILE_DEFAULT); if (QDF_IS_STATUS_ERROR(status)) { hdd_err("Failed to parse cfg %s; status:%d\n", WLAN_INI_FILE, status); @@ -11657,6 +11661,7 @@ struct hdd_context *hdd_context_create(struct device *dev) goto err_free_config; } +cfg_exit: ret = hdd_objmgr_create_and_store_psoc(hdd_ctx, DEFAULT_PSOC_ID); if (ret) { QDF_DEBUG_PANIC("Psoc creation fails!");