commit 9ab32a06eb3da039833d82be05b60dd7edf6668d
author sarvsaur <quic_sarvsaur@quicinc.com> Thu Mar 20 16:29:02 2025 +0530
committer sarvsaur <quic_sarvsaur@quicinc.com> Thu Mar 20 16:29:02 2025 +0530
tree 7b436c095f7671f459c920deb4bd081df2535abf
parent 2909e058d1ab8e51de73e514a2148dba9036edc0

FM: Modified condition variable wait to avoid deadlock

Added an additional condition to block the thread until
event queue is not empty

Change-Id: I8e68eb4db01cf551e03f2860255bee8b5a385a63

fm_hci/fm_hci.cpp

diff --git a/fm_hci/fm_hci.cpp b/fm_hci/fm_hci.cpp
index 527ecb4..04dea0c 100644
--- a/fm_hci/fm_hci.cpp
+++ b/fm_hci/fm_hci.cpp
@@ -430,7 +430,7 @@
     while (hci.state != FM_RADIO_DISABLING && hci.state != FM_RADIO_DISABLED) {
         //wait for rx event
         ALOGI("%s:before wait", __func__);
-        hci.rx_cond.wait(lk);
+        hci.rx_cond.wait(lk, []{return !hci.rx_event_queue.empty();});
         ALOGI("%s:after wait ", __func__);
         dequeue_fm_rx_event();
     }