commit 12e2dae12c397a215e8dcb7fc16609a5b2cc4230
author Deepthi Gowri <c_gowri@qti.qualcomm.com> Mon Dec 07 17:32:09 2015 +0530
committer Satyanarayana Dash <sadash@codeaurora.org> Tue Dec 08 16:06:00 2015 +0530
tree 0bbe1ec4fdc4b5a648235810fdb8b02dea5e3e6a
parent 4506bae7f31e55f931ea5a00def782aed2c9ff09

prima: validate if ROC timer is initialized

Fetching the ROC timer state without validating if the timer initialized
will lead to assert, if the ROC timer is not initialized.

To address this, ensure to check if ROC timer is initialized
before reading state of ROC timer.

CRs-Fixed: 948104
Change-Id: I4d8c4a9c8d2779b11e549d0e1a1fa7825af097b7

CORE/HDD/src/wlan_hdd_p2p.c

diff --git a/CORE/HDD/src/wlan_hdd_p2p.c b/CORE/HDD/src/wlan_hdd_p2p.c
index 1da6eb4..ac27b77 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -2531,6 +2531,8 @@
                  }
              }
              if (pRemainChanCtx != NULL &&
+                  vos_timer_is_initialized(
+                     &cfgState->remain_on_chan_ctx->hdd_remain_on_chan_timer) &&
                   VOS_TIMER_STATE_RUNNING != vos_timer_getCurrentState(
                       &cfgState->remain_on_chan_ctx->hdd_remain_on_chan_timer))
                  hddLog( LOG1, "%s:"