Parcourir la source

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

components/bt: Fix crash in Bluetooth when esp_restart

See merge request espressif/esp-idf!12567
Jiang Jiang Jian il y a 5 ans
Parent
commit
37a8c8ce6c
1 fichiers modifiés avec 2 ajouts et 6 suppressions
  1. 2 6
      components/bt/controller/bt.c

+ 2 - 6
components/bt/controller/bt.c

@@ -1328,7 +1328,7 @@ esp_err_t esp_bt_controller_init(esp_bt_controller_config_t *cfg)
     if (btdm_dram_available_region[0].mode == ESP_BT_MODE_IDLE) {
     if (btdm_dram_available_region[0].mode == ESP_BT_MODE_IDLE) {
         return ESP_ERR_INVALID_STATE;
         return ESP_ERR_INVALID_STATE;
     }
     }
-    
+
     osi_funcs_p = (struct osi_funcs_t *)malloc_internal_wrapper(sizeof(struct osi_funcs_t));
     osi_funcs_p = (struct osi_funcs_t *)malloc_internal_wrapper(sizeof(struct osi_funcs_t));
     if (osi_funcs_p == NULL) {
     if (osi_funcs_p == NULL) {
         return ESP_ERR_NO_MEM;
         return ESP_ERR_NO_MEM;
@@ -1538,16 +1538,12 @@ esp_err_t esp_bt_controller_deinit(void)
 static void bt_shutdown(void)
 static void bt_shutdown(void)
 {
 {
     esp_err_t ret = ESP_OK;
     esp_err_t ret = ESP_OK;
-    ESP_LOGD(BTDM_LOG_TAG, "stop/deinit bt");
+    ESP_LOGD(BTDM_LOG_TAG, "stop Bluetooth");
 
 
     ret = esp_bt_controller_disable();
     ret = esp_bt_controller_disable();
     if (ESP_OK != ret) {
     if (ESP_OK != ret) {
         ESP_LOGW(BTDM_LOG_TAG, "controller disable ret=%d", ret);
         ESP_LOGW(BTDM_LOG_TAG, "controller disable ret=%d", ret);
     }
     }
-    ret = esp_bt_controller_deinit();
-    if (ESP_OK != ret) {
-        ESP_LOGW(BTDM_LOG_TAG, "controller deinit ret=%d", ret);
-    }
     return;
     return;
 }
 }