From 169de30ce6bc28c3749c7288e37d8e8016cf4dfb Mon Sep 17 00:00:00 2001 From: Prakash Dhavali Date: Wed, 30 Nov 2016 12:52:49 -0800 Subject: [PATCH] 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 --- core/hdd/src/wlan_hdd_ipa.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/core/hdd/src/wlan_hdd_ipa.c b/core/hdd/src/wlan_hdd_ipa.c index 15a97c7c3e2e..d0bc10cc7bb9 100644 --- a/core/hdd/src/wlan_hdd_ipa.c +++ b/core/hdd/src/wlan_hdd_ipa.c @@ -886,11 +886,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)) { @@ -899,6 +894,12 @@ static void hdd_ipa_uc_rt_debug_deinit(hdd_context_t *hdd_ctx) return; } + 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);