commit d55597730e9081f45ac8997804c8bc609e2fe236
author Linux Build Service Account <lnxbuild@localhost> Wed Sep 28 23:01:04 2022 -0700
committer Linux Build Service Account <lnxbuild@localhost> Wed Sep 28 23:01:04 2022 -0700
tree 97dc7157178b033d9ee687a29c37c67155a27b63
parent fb3064ac8f1d21c35f8cb9715545b23d9d036709
parent 838704206c80716e0cd25322ae4b2c32970b94bf

Merge 838704206c80716e0cd25322ae4b2c32970b94bf on remote branch

Change-Id: I8327d9980eb9caeb1cac3a26c2519d984adcbe66

fm_hci/fm_hci.cpp

diff --git a/fm_hci/fm_hci.cpp b/fm_hci/fm_hci.cpp
index f33275e..0869afc 100644
--- a/fm_hci/fm_hci.cpp
+++ b/fm_hci/fm_hci.cpp
@@ -65,6 +65,7 @@
 static struct fm_hci_t hci;
 
 typedef std::unique_lock<std::mutex> Lock;
+static std::recursive_mutex mtx;
 android::sp<IFmHci> fmHci;
 
 static int enqueue_fm_rx_event(struct fm_event_header_t *hdr);
@@ -597,7 +598,8 @@
 *******************************************************************************/
 static bool hci_initialize()
 {
-    ALOGI("%s", __func__);
+    ALOGI("%s: acquiring mutex", __func__);
+    std::lock_guard<std::recursive_mutex> lk(mtx);
 
     if (fmHci != nullptr) {
         hci.state = FM_RADIO_ENABLING;
@@ -628,7 +630,8 @@
 static void hci_transmit(struct fm_command_header_t *hdr) {
     HciPacket data;
 
-    ALOGI("%s: opcode 0x%x len:%d", __func__, hdr->opcode, hdr->len);
+    ALOGI("%s: opcode 0x%x len:%d, acquiring mutex", __func__, hdr->opcode, hdr->len);
+    std::lock_guard<std::recursive_mutex> lk(mtx);
 
     if (fmHci != nullptr) {
         data.setToExternal((uint8_t *)hdr, 3 + hdr->len);
@@ -658,7 +661,8 @@
 *******************************************************************************/
 static void hci_close()
 {
-    ALOGI("%s", __func__);
+    ALOGI("%s: acquiring mutex", __func__);
+    std::lock_guard<std::recursive_mutex> lk(mtx);
 
     if (fmHci != nullptr) {
         auto death_unlink = fmHci->unlinkToDeath(fmHciDeathRecipient);