espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-31 19:24:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_work_queue_delete_on_bluedroid_v5.2' into 'release/v5.2'

Browse Source 
fix(bt/bluedroid): Fixed work queue delete when create thread failed (v5.2)

See merge request espressif/esp-idf!33038
This commit is contained in:
Jiang Jiang Jian
2024-08-26 14:55:16 +08:00
parent 0fd45a0d0a 8d1cc85dd1
commit 36d2fd821f
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/common/osi/thread.c
View File

@@ -271,11 +271,11 @@ _err:
} }
for (int i = 0; i < thread->work_queue_num; i++) { for (int i = 0; i < thread->work_queue_num; i++) {
if (thread->work_queues[i]) { if (thread->work_queues && thread->work_queues[i]) {
osi_work_queue_delete(thread->work_queues[i]); osi_work_queue_delete(thread->work_queues[i]);
}
thread->work_queues[i] = NULL; thread->work_queues[i] = NULL;
} }
}
if (thread->work_queues) { if (thread->work_queues) {
osi_free(thread->work_queues); osi_free(thread->work_queues);

2
examples/bluetooth/bluedroid/ble_50/ble50_security_client/main/ble50_sec_gattc_demo.c
View File

@@ -430,7 +430,7 @@ static void esp_gap_cb(esp_gap_ble_cb_event_t event, esp_ble_gap_cb_param_t *par
} }
case ESP_GAP_BLE_EXT_SCAN_START_COMPLETE_EVT: case ESP_GAP_BLE_EXT_SCAN_START_COMPLETE_EVT:
if (param->ext_scan_start.status != ESP_BT_STATUS_SUCCESS) { if (param->ext_scan_start.status != ESP_BT_STATUS_SUCCESS) {
ESP_LOGE(GATTC_TAG, "scan start failed, error status = %x", param->scan_start_cmpl.status); ESP_LOGE(GATTC_TAG, "scan start failed, error status = %x", param->ext_scan_start.status);
break; break;
} }
ESP_LOGI(GATTC_TAG, "Scan start success"); ESP_LOGI(GATTC_TAG, "Scan start success");