commit 3e73216e5af5e6bef6a12e19dd629020e3ff3643
author Dmitry Shmidt <dimitrysh@google.com> Wed Oct 28 23:48:44 2009 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 28 23:48:44 2009 -0700
tree 9158c5e866d7c3a9d14ba89fdc6f86d4e33893c0
parent 74f703ab2b5c5504fa81d3e8cdca55f35d747169
parent ccaf1159003e724af6b158fd10870297af4fedeb

am ccaf1159: am cd434989: am 13a77412: Postpone setting complete flag to the real FW start (http://b/issue?id=2198151)

Merge commit 'ccaf1159003e724af6b158fd10870297af4fedeb'

* commit 'ccaf1159003e724af6b158fd10870297af4fedeb':
  Postpone setting complete flag to the real FW start (http://b/issue?id=2198151)

wilink_6_1/stad/src/Ctrl_Interface/DrvMain.c

diff --git a/wilink_6_1/stad/src/Ctrl_Interface/DrvMain.c b/wilink_6_1/stad/src/Ctrl_Interface/DrvMain.c
index 257cf20..9e55fa6 100644
--- a/wilink_6_1/stad/src/Ctrl_Interface/DrvMain.c
+++ b/wilink_6_1/stad/src/Ctrl_Interface/DrvMain.c
@@ -1588,10 +1588,6 @@
         if (eEvent == SM_EVENT_FW_INIT_COMPLETE)
         {
             pDrvMain->eSmState = SM_STATE_FW_CONFIG;
-            if (!pDrvMain->bRecovery)
-            {
-                os_SignalObjectSet(hOs, pDrvMain->hSignalObj);
-            }
             TWD_EnableInterrupts(pDrvMain->tStadHandles.hTWD);
           #ifdef PRIODIC_INTERRUPT
             /* Start periodic interrupts. It means that every period of time the FwEvent SM will be called */
@@ -1633,6 +1629,10 @@
             eStatus = TI_OK;
            
         }
+        if (!pDrvMain->bRecovery)
+        {
+            os_SignalObjectSet(hOs, pDrvMain->hSignalObj);
+        }
         break;
     case SM_STATE_OPERATIONAL:
         /*