commit 298a8593e7e26633893e7bd7b45a0bd35176b233
author Sushant Kaushik <skaushik@qti.qualcomm.com> Tue Dec 09 17:34:07 2014 +0530
committer Satyanarayana Dash <c_sadash@qti.qualcomm.com> Thu Dec 11 11:38:47 2014 +0530
tree ebe038a77c2896cb7da8fadfb5a73417bde61a1c
parent 99bd6c476607a211cd669f577f002dac7ac9ff43

wlan: Error handling for RoC Request.

Currently there was no error handling in HDD and
SME for RoC Request. As part of fix, added error
handling code for RoC Request.

Change-Id: Icb5b93ab8e57e19b9510f936acd887cf611ddd17
CRs-Fixed: 768350

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 e8e903e..9cd9b9a 100644
--- a/CORE/HDD/src/wlan_hdd_p2p.c
+++ b/CORE/HDD/src/wlan_hdd_p2p.c
@@ -555,11 +555,20 @@
     {
         tANI_U8 sessionId = pAdapter->sessionId;
         //call sme API to start remain on channel.
-        sme_RemainOnChannel(
+        if (eHAL_STATUS_SUCCESS != sme_RemainOnChannel(
              WLAN_HDD_GET_HAL_CTX(pAdapter), sessionId,
              chan->hw_value, duration,
              wlan_hdd_remain_on_channel_callback, pAdapter,
-             (tANI_U8)(request_type == REMAIN_ON_CHANNEL_REQUEST)? TRUE:FALSE);
+             (tANI_U8)(request_type == REMAIN_ON_CHANNEL_REQUEST)? TRUE:FALSE))
+        {
+            VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
+                    FL(" RemainOnChannel returned fail"));
+            cfgState->remain_on_chan_ctx = NULL;
+            vos_timer_destroy(&pRemainChanCtx->hdd_remain_on_chan_timer);
+            vos_mem_free (pRemainChanCtx);
+            hdd_allow_suspend();
+            return -EINVAL;
+        }
 
         if( REMAIN_ON_CHANNEL_REQUEST == request_type)
         {
@@ -588,8 +597,9 @@
            VOS_TRACE( VOS_MODULE_ID_HDD, VOS_TRACE_LEVEL_ERROR,
                     "%s: WLANSAP_RemainOnChannel returned fail", __func__);
            cfgState->remain_on_chan_ctx = NULL;
+           vos_timer_destroy(&pRemainChanCtx->hdd_remain_on_chan_timer);
            vos_mem_free (pRemainChanCtx);
-            hdd_allow_suspend();
+           hdd_allow_suspend();
            return -EINVAL;
         }