Merge branch 'bugfix/ble_bug_backport_20240205_v5.1' into 'release/v5.1'

Bugfix/ble bug backport 20240205 v5.1 (backport v5.1) See merge request espressif/esp-idf!28900
espressif · Feb 27, 2024 · 69900de · 69900de
2 parents 6481fdf + add7c68
commit 69900de
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/components/bt/controller/lib_esp32 b/components/bt/controller/lib_esp32
diff --git a/components/bt/host/bluedroid/hci/hci_hal_h4.c b/components/bt/host/bluedroid/hci/hci_hal_h4.c
@@ -138,15 +138,20 @@ static bool hci_hal_env_init(const hci_hal_callbacks_t *upper_callbacks, osi_thr
 
 static void hci_hal_env_deinit(void)
 {
-    fixed_queue_free(hci_hal_env.rx_q, osi_free_func);
-    hci_hal_env.rx_q = NULL;
+    fixed_queue_t *rx_q = hci_hal_env.rx_q;
+    struct pkt_queue *adv_rpt_q = hci_hal_env.adv_rpt_q;
+    struct osi_event *upstream_data_ready = hci_hal_env.upstream_data_ready;
 
-    pkt_queue_destroy(hci_hal_env.adv_rpt_q, NULL);
+    hci_hal_env.rx_q = NULL;
     hci_hal_env.adv_rpt_q = NULL;
-
-    osi_event_delete(hci_hal_env.upstream_data_ready);
     hci_hal_env.upstream_data_ready = NULL;
 
+    fixed_queue_free(rx_q, osi_free_func);
+
+    pkt_queue_destroy(adv_rpt_q, NULL);
+
+    osi_event_delete(upstream_data_ready);
+
 #if (BLE_ADV_REPORT_FLOW_CONTROL == TRUE)
     hci_hal_env.cmd_buf_in_use = true;
     osi_alarm_cancel(hci_hal_env.adv_flow_monitor);