summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorService qcabuildsw <qcabuildsw@localhost>2016-10-28 10:23:39 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2016-10-28 10:23:39 -0700
commit331562d37d1a5694bf1520eb578607e314fbab8e (patch)
tree15ccf3696f6624288925f24907d891a027caa87a
parentf419b526dfe4bdd719d8475dc6840bbe74a3304b (diff)
parent27f2037fa655e838478a6e5b14b46b2038815a03 (diff)
Merge "qcacld-3.0: Destroy tx_frm_download_comp_event in wma_close" into wlan-cld3.driver.lnx.1.1-dev
-rw-r--r--core/wma/src/wma_data.c5
-rw-r--r--core/wma/src/wma_main.c2
2 files changed, 2 insertions, 5 deletions
diff --git a/core/wma/src/wma_data.c b/core/wma/src/wma_data.c
index e0c76e7dfa9a..8972e1791cc6 100644
--- a/core/wma/src/wma_data.c
+++ b/core/wma/src/wma_data.c
@@ -1556,11 +1556,6 @@ QDF_STATUS wma_tx_detach(tp_wma_handle wma_handle)
NULL, txrx_pdev);
}
}
- /* Destroy Tx Frame Complete event */
- qdf_event_destroy(&wma_handle->tx_frm_download_comp_event);
-
- /* Tx queue empty check event (dummy event) */
- qdf_event_destroy(&wma_handle->tx_queue_empty_event);
/* Reset Tx Frm Callbacks */
wma_handle->tx_frm_download_comp_cb = NULL;
diff --git a/core/wma/src/wma_main.c b/core/wma/src/wma_main.c
index e2e7e1642b44..3962513329ea 100644
--- a/core/wma/src/wma_main.c
+++ b/core/wma/src/wma_main.c
@@ -3475,6 +3475,8 @@ QDF_STATUS wma_close(void *cds_ctx)
qdf_event_destroy(&wma_handle->wma_resume_event);
qdf_event_destroy(&wma_handle->runtime_suspend);
qdf_event_destroy(&wma_handle->recovery_event);
+ qdf_event_destroy(&wma_handle->tx_frm_download_comp_event);
+ qdf_event_destroy(&wma_handle->tx_queue_empty_event);
wma_cleanup_vdev_resp(wma_handle);
wma_cleanup_hold_req(wma_handle);
qdf_wake_lock_destroy(&wma_handle->wmi_cmd_rsp_wake_lock);