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

Bugfix/ble bug backport 20240205 (backport v5.0)

See merge request espressif/esp-idf!28898
This commit is contained in:
Jiang Jiang Jian 2024-02-23 10:47:06 +08:00
commit d253654f0f
2 changed files with 11 additions and 6 deletions

@ -1 +1 @@
Subproject commit b0f132f17ed48553a4638344023d44af61b7c20a
Subproject commit e43c9b121f7fac89b73c56077ede5901f64643cd

View File

@ -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);
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;
hci_hal_env.rx_q = NULL;
pkt_queue_destroy(hci_hal_env.adv_rpt_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);