Merge branch 'bugfix/coex_enable_disable_not_in_pairs_v4.4' into 'rel…

…ease/v4.4' bluetooth: fix that functions "coex_enable" and "coex_disable" are not used in pairs(backport v4.4) See merge request espressif/esp-idf!22095
espressif · Feb 3, 2023 · a60b89b · a60b89b
2 parents 56083a1 + 86b2779
commit a60b89b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/components/bt/controller/esp32c3/bt.c b/components/bt/controller/esp32c3/bt.c
@@ -1382,7 +1382,7 @@ static void bt_controller_deinit_internal(void)
 
 esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
 {
-    int ret = ESP_OK;
+    esp_err_t ret = ESP_OK;
 
     if (btdm_controller_status != ESP_BT_CONTROLLER_STATUS_INITED) {
         return ESP_ERR_INVALID_STATE;
@@ -1437,6 +1437,9 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
 #endif
     } while (0);
 
+#if CONFIG_SW_COEXIST_ENABLE
+    coex_disable();
+#endif
     return ret;
 }
 

diff --git a/components/bt/controller/esp32s3/bt.c b/components/bt/controller/esp32s3/bt.c
@@ -1428,7 +1428,7 @@ static void bt_controller_deinit_internal(void)
 
 esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
 {
-    int ret = ESP_OK;
+    esp_err_t ret = ESP_OK;
 
     if (btdm_controller_status != ESP_BT_CONTROLLER_STATUS_INITED) {
         return ESP_ERR_INVALID_STATE;
@@ -1483,6 +1483,9 @@ esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode)
 #endif
     } while (0);
 
+#if CONFIG_SW_COEXIST_ENABLE
+    coex_disable();
+#endif
     return ret;
 }