diff --git a/components/bt/controller/esp32c2/bt.c b/components/bt/controller/esp32c2/bt.c index 42c92c5d00..01a9154f0e 100644 --- a/components/bt/controller/esp32c2/bt.c +++ b/components/bt/controller/esp32c2/bt.c @@ -561,14 +561,13 @@ void controller_sleep_deinit(void) /*lock should release first and then delete*/ if (s_pm_lock_acquired) { - if(s_light_sleep_pm_lock != NULL) - esp_pm_lock_release(s_light_sleep_pm_lock); - } + if (s_light_sleep_pm_lock != NULL) { + esp_pm_lock_release(s_light_sleep_pm_lock); + } - if(s_pm_lock != NULL) { + if (s_pm_lock != NULL) { esp_pm_lock_release(s_pm_lock); - } - s_pm_lock_acquired = false; + } } if (!s_btdm_allow_light_sleep) { diff --git a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib index c039a68dcf..90749ea1cb 160000 --- a/components/bt/controller/lib_esp32c2/esp32c2-bt-lib +++ b/components/bt/controller/lib_esp32c2/esp32c2-bt-lib @@ -1 +1 @@ -Subproject commit c039a68dcf49082c37318568b2e147b61265e772 +Subproject commit 90749ea1cbbc568bc75a673b0d50b89322066a09 diff --git a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld index 6254205e5a..950a08afae 100644 --- a/components/esp_rom/esp32c2/ld/esp32c2.rom.ld +++ b/components/esp_rom/esp32c2/ld/esp32c2.rom.ld @@ -1168,7 +1168,6 @@ r_ble_lll_conn_process_acked_pdu = 0x4000154c; r_ble_lll_conn_recv_ack = 0x40001554; r_ble_lll_conn_recv_valid_packet = 0x40001558; r_ble_lll_conn_reset_pending_sched = 0x4000155c; -r_ble_lll_conn_rx_pkt_isr = 0x40001560; r_ble_lll_conn_sched_next_anchor = 0x40001564; r_ble_lll_conn_sched_next_event = 0x40001568; r_ble_lll_conn_sm_new = 0x40001574; @@ -1224,6 +1223,7 @@ r_ble_lll_reset = 0x40001644; r_ble_lll_rfmgmt_controller_sleep_en = 0x40001648; r_ble_lll_rfmgmt_enable_now = 0x40001658; r_ble_lll_rfmgmt_is_enabled = 0x40001660; +r_ble_lll_rfmgmt_release = 0x40001664; r_ble_lll_rfmgmt_release_ev = 0x40001668; r_ble_lll_rfmgmt_scan_changed = 0x40001670; r_ble_lll_rfmgmt_sched_changed = 0x40001674;