commit b8b13ebc25ae83d04a77c235eb1a0cedd00660bd
author CNSS_WLAN Service <cnssbldsw@qualcomm.com> Fri Apr 04 00:38:36 2025 -0700
committer Gerrit - the friendly Code Review server <code-review@localhost> Fri Apr 04 00:38:36 2025 -0700
tree f2e1cb2ea4984666d78653bdd452b96d682734b1
parent 0219a97284fcccc8a3b318a6e13b0fe7def9558b
parent 9ab32a06eb3da039833d82be05b60dd7edf6668d

Merge "FM: Modified condition variable wait to avoid deadlock" into fm-sys.lnx.15.0

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();
     }