commit 9a61df9b4b59e7eb201a5c647fea5cc997321d7c
author Linux Build Service Account <lnxbuild@localhost> Mon Oct 03 08:55:47 2016 -0600
committer Linux Build Service Account <lnxbuild@localhost> Mon Oct 03 08:55:47 2016 -0600
tree 3eb796104d214ed59f954189e889116d7e3d53d8
parent ef02e2226295b60f9c15630e3863140e7cd9a770
parent a9e487b7d0a6f4bfa96e17f0d41f41e75b80685c

Promotion of fm.lnx.2.1-00007.

CRs      Change ID                                   Subject
--------------------------------------------------------------------------------------------------------------
1072045   Ibb2cf98ade08bbc9b25946d2368b1b7e428397bc   fm: synchronize dequeue_fm_tx_cmd function

Change-Id: I7d1beecd162066ed833823e1226ae803300a1443
CRs-Fixed: 1072045

fm_hci/fm_hci.c

diff --git a/fm_hci/fm_hci.c b/fm_hci/fm_hci.c
index 8c6173a..2fafe83 100644
--- a/fm_hci/fm_hci.c
+++ b/fm_hci/fm_hci.c
@@ -138,12 +138,11 @@
         }
         pthread_mutex_unlock(&hci->tx_q_lock);
 
-wait_for_cmd_credits:
         pthread_mutex_lock(&hci->credit_lock);
+wait_for_cmd_credits:
         while (hci->command_credits == 0) {
               pthread_cond_wait(&hci->cmd_credits_cond, &hci->credit_lock);
         }
-        pthread_mutex_unlock(&hci->credit_lock);
 
         /* Check if we really got the command credits */
         if (hci->command_credits) {
@@ -160,14 +159,18 @@
             count = 0;
 
             /* Decrement cmd credits by '1' after sending the cmd*/
-            pthread_mutex_lock(&hci->credit_lock);
             hci->command_credits--;
-            pthread_mutex_unlock(&hci->credit_lock);
+            if (temp->hdr)
+                free(temp->hdr);
+            free(temp);
         } else {
-            if (!lib_running)
+            if (!lib_running) {
+                pthread_mutex_unlock(&hci->credit_lock);
                 break;
+            }
             goto wait_for_cmd_credits;
         }
+        pthread_mutex_unlock(&hci->credit_lock);
     }
 }