summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHouston Hoffman <hhoffman@codeaurora.org>2016-12-12 12:06:26 -0800
committerqcabuildsw <qcabuildsw@localhost>2016-12-24 16:00:15 -0800
commit332987ce33ee28cc165d82c57213c4f9ff2b016b (patch)
treeb7c42ece34f50b20b91ee8177d0c2f85b010ae4e
parentf25b3b32c9dd29816284b89e9f983840ec25d480 (diff)
qcacld-3.0: Do mem_init before calling qdf_spinlock_create
Doing mem_init first allows other qdf_features to allocate memory for profiling and tracking using the qdf_mem_alloc apis. Change-Id: Id4f830a83a745763058ff2f05138b80558fe1d1f CRs-Fixed: 1100552
-rw-r--r--core/cds/src/cds_api.c2
-rw-r--r--core/hdd/src/wlan_hdd_main.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index c2504f4f9a96..46e1cd0ee111 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -88,8 +88,8 @@ void cds_sys_probe_thread_cback(void *pUserData);
*/
v_CONTEXT_t cds_init(void)
{
- qdf_mc_timer_manager_init();
qdf_mem_init();
+ qdf_mc_timer_manager_init();
gp_cds_context = &g_cds_context;
diff --git a/core/hdd/src/wlan_hdd_main.c b/core/hdd/src/wlan_hdd_main.c
index 555479e972ff..693ceeb399fe 100644
--- a/core/hdd/src/wlan_hdd_main.c
+++ b/core/hdd/src/wlan_hdd_main.c
@@ -9202,10 +9202,10 @@ int hdd_init(void)
v_CONTEXT_t p_cds_context = NULL;
int ret = 0;
+ p_cds_context = cds_init();
#ifdef WLAN_LOGGING_SOCK_SVC_ENABLE
wlan_logging_sock_init_svc();
#endif
- p_cds_context = cds_init();
if (p_cds_context == NULL) {
hdd_alert("Failed to allocate CDS context");