alex/esp-idf
alex/esp-idf
1
0
Fork 0
mirror of https://github.com/espressif/esp-idf.git synced 2024-10-05 20:47:46 -04:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'bugfix/fix_crash_when_shutdown_bt_v4.4' into 'release/v4.4'

Browse Source 
component/bt: fix crash when shutdown bt(backport v4.4)

See merge request espressif/esp-idf!15708
This commit is contained in:
Wang Meng Yang 2021-11-09 08:06:24 +00:00
commit 5e4d166323
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
components/bt/controller/esp32/bt.c
View File

@ -239,6 +239,8 @@ extern uint8_t coex_schm_curr_period_get(void);
extern void * coex_schm_curr_phase_get(void);
extern int coex_wifi_channel_get(uint8_t *primary, uint8_t *secondary);
extern int coex_register_wifi_channel_change_callback(void *cb);
/* Shutdown */
extern void esp_bt_controller_shutdown(void);
extern char _bss_start_btdm;
extern char _bss_end_btdm;
@ -1787,13 +1789,13 @@ esp_err_t esp_bt_controller_deinit(void)
static void bt_shutdown(void)
{
esp_err_t ret = ESP_OK;
ESP_LOGD(BTDM_LOG_TAG, "stop Bluetooth");
ret = esp_bt_controller_disable();
if (ESP_OK != ret) {
ESP_LOGW(BTDM_LOG_TAG, "controller disable ret=%d", ret);
if (btdm_controller_status != ESP_BT_CONTROLLER_STATUS_ENABLED) {
return;
}
esp_bt_controller_shutdown();
esp_phy_disable();
return;
}

2
components/bt/controller/lib_esp32

@ -1 +1 @@
Subproject commit f26e741554f70f0fe0621924c26e89fb9ee8f765
Subproject commit fe048744fce335ab75777f4a386885faf4acc250