commit cb60708578e9f3d85fcd1f130bc44db344c46aae
author Arif Hussain <c_arifh@qca.qualcomm.com> Fri Dec 20 11:57:42 2013 -0800
committer AnjaneeDevi Kapparapu <akappa@codeaurora.org> Tue Dec 24 12:06:05 2013 +0530
tree 54010590b979132cf0acc09e7b2deba2eb57d852
parent f19c1f6877d77feea1fdc8a71755be0ee7f2ce33

wlan: Wrong check to log error message

Setting country code from module param is
log fail message because of wrong check.

Change-Id: Ie2debeb1f9d4f3861adc7279235731d2086ae937
CRs-Fixed: 592652

CORE/HDD/src/wlan_hdd_main.c

diff --git a/CORE/HDD/src/wlan_hdd_main.c b/CORE/HDD/src/wlan_hdd_main.c
index edeae74..61298a6 100644
--- a/CORE/HDD/src/wlan_hdd_main.c
+++ b/CORE/HDD/src/wlan_hdd_main.c
@@ -8002,6 +8002,7 @@
    if (country_code)
    {
       eHalStatus ret;
+      INIT_COMPLETION(pAdapter->change_country_code);
       hdd_checkandupdate_dfssetting(pAdapter, country_code);
 #ifndef CONFIG_ENABLE_LINUX_REG
       hdd_checkandupdate_phymode(pAdapter, country_code);
@@ -8012,14 +8013,21 @@
                                   eSIR_TRUE, eSIR_TRUE);
       if (eHAL_STATUS_SUCCESS == ret)
       {
-         VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
-                   "%s: SME Change Country code from module param fail ret=%d",
-                   __func__, ret);
+         ret = wait_for_completion_interruptible_timeout(
+                       &pAdapter->change_country_code,
+                       msecs_to_jiffies(WLAN_WAIT_TIME_COUNTRY));
+
+         if (0 >= ret)
+         {
+            VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+                      "%s: SME while setting country code timed out", __func__);
+         }
       }
       else
       {
-         hddLog(VOS_TRACE_LEVEL_INFO, "%s: module country code set to %c%c",
-                __func__, country_code[0], country_code[1]);
+         VOS_TRACE(VOS_MODULE_ID_VOSS, VOS_TRACE_LEVEL_ERROR,
+                   "%s: SME Change Country code from module param fail ret=%d",
+                   __func__, ret);
       }
    }