summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYun Park <yunp@codeaurora.org>2016-11-30 12:52:49 -0800
committerqcabuildsw <qcabuildsw@localhost>2016-12-05 20:09:07 -0800
commitef0ca4a17c0c222ed1e4fdf181afe27e8857d2d1 (patch)
treea197e6407064c005072e47a2325c26f423a4af56
parent19a6b3793db4c2a660db4940351420b4d05a6a12 (diff)
qcacld-3.0: Fix timer destroy warning when RT debugging not enabled
When HDD IPA RT debugging is not enabled, rt_debug_fill_timer is not initialized. However, we still check the timer status to destroy the timer while deinit RT debug. Change-Id: Ic541301843e4d72ad2bc6181728cf18c97d6191a CRs-fixed: 1095787
-rw-r--r--core/hdd/src/wlan_hdd_ipa.c11
1 files changed, 6 insertions, 5 deletions
diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c
index 3e0bb39d98e7..b1176c3325d5 100644
--- a/core/hdd/src/wlan_hdd_ipa.c
+++ b/core/hdd/src/wlan_hdd_ipa.c
@@ -887,11 +887,6 @@ static void hdd_ipa_uc_rt_debug_deinit(hdd_context_t *hdd_ctx)
{
struct hdd_ipa_priv *hdd_ipa = (struct hdd_ipa_priv *)hdd_ctx->hdd_ipa;
- if (QDF_TIMER_STATE_STOPPED !=
- qdf_mc_timer_get_current_state(&hdd_ipa->rt_debug_fill_timer)) {
- qdf_mc_timer_stop(&hdd_ipa->rt_debug_fill_timer);
- }
- qdf_mc_timer_destroy(&hdd_ipa->rt_debug_fill_timer);
qdf_mutex_destroy(&hdd_ipa->rt_debug_lock);
if (!hdd_ipa_is_rt_debugging_enabled(hdd_ctx)) {
@@ -901,6 +896,12 @@ static void hdd_ipa_uc_rt_debug_deinit(hdd_context_t *hdd_ctx)
}
if (QDF_TIMER_STATE_STOPPED !=
+ qdf_mc_timer_get_current_state(&hdd_ipa->rt_debug_fill_timer)) {
+ qdf_mc_timer_stop(&hdd_ipa->rt_debug_fill_timer);
+ }
+ qdf_mc_timer_destroy(&hdd_ipa->rt_debug_fill_timer);
+
+ if (QDF_TIMER_STATE_STOPPED !=
qdf_mc_timer_get_current_state(&hdd_ipa->rt_debug_timer)) {
qdf_mc_timer_stop(&hdd_ipa->rt_debug_timer);
}