From 5f172ab2513873f27e0abd51849f8a6707a14d6c Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 18 Sep 2024 15:57:31 +0800 Subject: [PATCH 1/2] fix(ble): fixed occasional assertion issue when enabling logging on ESP32-C2 (cherry picked from commit 0ef9ecb715f93bd0c4c4785357cabcaa36b31273) Co-authored-by: zwl --- components/bt/controller/lib_esp32c2/esp32c2-bt-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index e652624750..e5c7ef0bf7 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit e652624750341aca124e9f850e261b0c1ac63529 +Subproject commit e5c7ef0bf701d02c2203e26081fdd348d45935e5 From a9d04549ceccaea47c762e5601d4cc05e40e2b61 Mon Sep 17 00:00:00 2001 From: Zhao Wei Liang Date: Wed, 18 Sep 2024 15:57:33 +0800 Subject: [PATCH 2/2] fix(ble): fixed memory leak issue when using uart hci (cherry picked from commit 4d2c44f511ee00f6e491790e2bc9fbdc6726dbd6) Co-authored-by: zwl --- components/bt/porting/transport/driver/uart/hci_driver_uart.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/bt/porting/transport/driver/uart/hci_driver_uart.c b/components/bt/porting/transport/driver/uart/hci_driver_uart.c index 6ac2a462fa..933a6584ef 100644 --- a/components/bt/porting/transport/driver/uart/hci_driver_uart.c +++ b/components/bt/porting/transport/driver/uart/hci_driver_uart.c @@ -154,7 +154,7 @@ hci_driver_uart_deinit(void) ESP_ERROR_CHECK(uart_driver_delete(s_hci_driver_uart_env.hci_uart_params->hci_uart_port)); - if (!s_hci_driver_uart_env.tx_sem) { + if (s_hci_driver_uart_env.tx_sem) { vSemaphoreDelete(s_hci_driver_uart_env.tx_sem); }