commit 06328fd0685772c5e2699f4e7b0bf1dfd3588899
author Ajay Kumar <ajayku@codeaurora.org> Thu Sep 11 19:28:17 2014 +0530
committer Linux Build Service Account <lnxbuild@localhost> Tue Nov 04 08:47:35 2014 -0700
tree 2d6d1ed3b57ebd88081c2498c4e53da8e9664627
parent 795fd12a30ee0e092937df0e350f8dc1225c1cfb

Bluetooth :Changing the sequence to avoid the deadlock

Due to the variable open and close will be stuck in
loop forever.Moreover change the loop condition to
allow timeout and iteration to 50 since it take
10 secs sometime.

Change-Id: I545bd51a8ddeaf9ff98a9f984f6fa0e6f7915443
CRs-Fixed: 699359

hci/src/userial_mct.c

diff --git a/hci/src/userial_mct.c b/hci/src/userial_mct.c
index b48acb2..01f5b25 100644
--- a/hci/src/userial_mct.c
+++ b/hci/src/userial_mct.c
@@ -60,7 +60,7 @@
 #endif
 
 #define MAX_SERIAL_PORT (USERIAL_PORT_3 + 1)
-#define MAX_RETRIAL_CLOSE 10
+#define MAX_RETRIAL_CLOSE 50
 
 enum {
     USERIAL_RX_EXIT,
@@ -280,17 +280,18 @@
 bool userial_open(userial_port_t port)
 {
     int result;
-    userial_state = USERIAL_STATE_OPENING;
 
     USERIALDBG("userial_open(port:%d)", port);
 
     if (userial_running)
     {
+        USERIALDBG("userial_open: userial_running =1");
         /* Userial is open; close it first */
         userial_close();
         utils_delay(50);
     }
 
+    userial_state = USERIAL_STATE_OPENING;
     if (port >= MAX_SERIAL_PORT)
     {
         ALOGE("Port > MAX_SERIAL_PORT");
@@ -422,12 +423,15 @@
 
     USERIALDBG("userial_close");
     userial_close_pending = TRUE;
-    while((userial_state == USERIAL_STATE_OPENING) || (i< MAX_RETRIAL_CLOSE))
+    while((userial_state == USERIAL_STATE_OPENING) && (i< MAX_RETRIAL_CLOSE))
     {
         usleep(200);
         i++;
     }
 
+    if (i == MAX_RETRIAL_CLOSE)
+        USERIALDBG("USERIAL CLOSE : Timeout in creating userial read thread");
+
     if (userial_running)
         send_wakeup_signal(USERIAL_RX_EXIT);