summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRajeev Kumar <rajekuma@codeaurora.org>2017-03-13 18:11:29 -0700
committerSandeep Puligilla <spuligil@codeaurora.org>2017-03-14 19:37:34 -0700
commit9d45182f4bcf3b5f372cd84e799a691e3b69b019 (patch)
tree39a592ea66c43795b3bd51c4dcc8f42e36a6e148
parent00002878bbb9ae2760e00980e1e8474509d07b3d (diff)
qcacld-3.0: Purge shutdown notification before wma_close
WMA registers for shutdown notification and during wma_close WMA events are destroyed which are accessed from WMA shutdown callback. Hence make sure to purge shutdown notification 1st before calling wma_close. Change-Id: I868a835f3da52596c0451f9c99638dbc97ea6abe CRs-Fixed: 2018911
-rw-r--r--core/cds/src/cds_api.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/cds/src/cds_api.c b/core/cds/src/cds_api.c
index a53d0ff021a0..c460287fc6b5 100644
--- a/core/cds/src/cds_api.c
+++ b/core/cds/src/cds_api.c
@@ -474,6 +474,7 @@ err_mac_close:
mac_close(gp_cds_context->pMACContext);
err_wma_close:
+ cds_shutdown_notifier_purge();
wma_close(gp_cds_context);
wma_wmi_service_close(gp_cds_context);
@@ -496,7 +497,6 @@ err_sched_close:
QDF_ASSERT(false);
}
}
- cds_shutdown_notifier_purge();
err_concurrency_lock:
qdf_mutex_destroy(&cds_ctx->qdf_conc_list_lock);
@@ -909,6 +909,8 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context)
((p_cds_contextType) cds_context)->pMACContext = NULL;
+ cds_shutdown_notifier_purge();
+
if (true == wma_needshutdown(cds_context)) {
QDF_TRACE(QDF_MODULE_ID_QDF, QDF_TRACE_LEVEL_ERROR,
"%s: Failed to shutdown wma", __func__);
@@ -950,8 +952,6 @@ QDF_STATUS cds_close(v_CONTEXT_t cds_context)
QDF_ASSERT(QDF_IS_STATUS_SUCCESS(qdf_status));
}
- cds_shutdown_notifier_purge();
-
cds_deinit_log_completion();
cds_deinit_ini_config();
qdf_timer_module_deinit();