Merge branch 'bugfix/fix_memory_leak_controller_deinit_v4.2' into 'release/v4.2'

ESP32: Fix memory leak in controller deinit function v4.2

See merge request espressif/esp-idf!15970
This commit is contained in:
Jiang Jiang Jian 2021-12-03 03:32:18 +00:00
commit 19643f715c

View File

@ -1519,9 +1519,18 @@ esp_err_t esp_bt_controller_deinit(void)
esp_pm_lock_delete(s_light_sleep_pm_lock);
s_light_sleep_pm_lock = NULL;
}
esp_timer_stop(s_btdm_slp_tmr);
esp_timer_delete(s_btdm_slp_tmr);
s_btdm_slp_tmr = NULL;
if (s_pm_lock != NULL) {
esp_pm_lock_delete(s_pm_lock);
s_pm_lock = NULL;
}
if (s_btdm_slp_tmr != NULL) {
esp_timer_stop(s_btdm_slp_tmr);
esp_timer_delete(s_btdm_slp_tmr);
s_btdm_slp_tmr = NULL;
}
s_pm_lock_acquired = false;
#endif
semphr_delete_wrapper(s_wakeup_req_sem);