samsung-sm8650/android_kernel_samsung_sm8650-modules
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qcacld-3.0: Continue cds_deinit_policy_mgr despite failures

Browse Source 
Cleanup should ignore errors without modifying execution as much
as possible.  If one item was not initialized propperly the
driver should still try to cleanup the rest.

Change-Id: If132c40dffc801972ba801bb4a269b5dd9b954ff
CRs-Fixed: 1079503
This commit is contained in:
Houston Hoffman
2016-10-10 16:40:44 -07:00
committed by qcabuildsw
parent 550c29e6f1
commit feb36ba5b1
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
core/cds/src/cds_concurrency.c
View File

@@ -3958,23 +3958,27 @@ static void cds_dbs_opportunistic_timer_handler(void *data)
QDF_STATUS cds_deinit_policy_mgr(void) QDF_STATUS cds_deinit_policy_mgr(void)
{ {
cds_context_type *cds_ctx; cds_context_type *cds_ctx;
QDF_STATUS status = QDF_STATUS_SUCCESS;
cds_ctx = cds_get_context(QDF_MODULE_ID_QDF); cds_ctx = cds_get_context(QDF_MODULE_ID_QDF);
if (!cds_ctx) { if (!cds_ctx) {
cds_err("Invalid CDS Context"); cds_err("Invalid CDS Context");
return QDF_STATUS_E_FAILURE; status = QDF_STATUS_E_FAILURE;
QDF_ASSERT(0);
} }
if (!QDF_IS_STATUS_SUCCESS(qdf_event_destroy if (!QDF_IS_STATUS_SUCCESS(qdf_event_destroy
(&cds_ctx->connection_update_done_evt))) { (&cds_ctx->connection_update_done_evt))) {
cds_err("Failed to destroy connection_update_done_evt"); cds_err("Failed to destroy connection_update_done_evt");
return QDF_STATUS_E_FAILURE; status = QDF_STATUS_E_FAILURE;
QDF_ASSERT(0);
} }
if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy( if (!QDF_IS_STATUS_SUCCESS(qdf_mutex_destroy(
&cds_ctx->qdf_conc_list_lock))) { &cds_ctx->qdf_conc_list_lock))) {
cds_err("Failed to destroy qdf_conc_list_lock"); cds_err("Failed to destroy qdf_conc_list_lock");
return QDF_STATUS_E_FAILURE; status = QDF_STATUS_E_FAILURE;
QDF_ASSERT(0);
} }
if (QDF_TIMER_STATE_RUNNING == if (QDF_TIMER_STATE_RUNNING ==
@@ -3986,7 +3990,8 @@ QDF_STATUS cds_deinit_policy_mgr(void)
if (!QDF_IS_STATUS_SUCCESS(qdf_mc_timer_destroy( if (!QDF_IS_STATUS_SUCCESS(qdf_mc_timer_destroy(
&cds_ctx->dbs_opportunistic_timer))) { &cds_ctx->dbs_opportunistic_timer))) {
cds_err("Cannot deallocate dbs opportunistic timer"); cds_err("Cannot deallocate dbs opportunistic timer");
return QDF_STATUS_E_FAILURE; status = QDF_STATUS_E_FAILURE;
QDF_ASSERT(0);
} }
cds_ctx->sme_get_valid_channels = NULL; cds_ctx->sme_get_valid_channels = NULL;
@@ -3994,10 +3999,11 @@ QDF_STATUS cds_deinit_policy_mgr(void)
if (QDF_IS_STATUS_ERROR(cds_reset_sap_mandatory_channels())) { if (QDF_IS_STATUS_ERROR(cds_reset_sap_mandatory_channels())) {
cds_err("failed to reset sap mandatory channels"); cds_err("failed to reset sap mandatory channels");
return QDF_STATUS_E_FAILURE; status = QDF_STATUS_E_FAILURE;
QDF_ASSERT(0);
} }
return QDF_STATUS_SUCCESS; return status;
} }
/** /**