commit da3607d6f5715022c53f52b7ed700be0fdc66e46
author Vinit Deshpande <vinitd@google.com> Thu Jun 04 20:01:03 2015 -0700
committer The Android Automerger <android-build@google.com> Fri Jun 05 10:07:20 2015 -0700
tree ec531a5bcf201623d08db6044d8f66801b8c8977
parent 79c41bc9ff10a322cf6cacc51b80707d5ba5a4ee

Fix a deadlock in wifi_cleanup

pthread_mutex isn't re-entrant; and results in a hang
if called second time from the same thread. This change
ensures that it is locked only once.

Bug: 21627368
Change-Id: I9c28c1df240316c2a7eafdefa990b9582bc05a9a

bcmdhd/wifi_hal/wifi_hal.cpp

diff --git a/bcmdhd/wifi_hal/wifi_hal.cpp b/bcmdhd/wifi_hal/wifi_hal.cpp
index 03bcc4b..20d2b28 100644
--- a/bcmdhd/wifi_hal/wifi_hal.cpp
+++ b/bcmdhd/wifi_hal/wifi_hal.cpp
@@ -283,7 +283,9 @@
         WifiCommand *cmd = (WifiCommand *)cbi->cb_arg;
         if (cmd != NULL) {
             cmd->addRef();
+            pthread_mutex_unlock(&info->cb_lock);
             cmd->cancel();
+            pthread_mutex_lock(&info->cb_lock);
             cmd->releaseRef();
         }
     }