espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-01 03:34:32 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
bluetooth: fix that functions "coex_enable" and "coex_disable" are not used in pairs(backport v4.4)

See merge request espressif/esp-idf!22095
This commit is contained in:
Jiang Jiang Jian
2023-02-03 13:50:53 +08:00
parent 56083a12fc 86b2779adc
commit a60b89bb49
2 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/bt/controller/esp32c3/bt.c
View File

@@ -1382,7 +1382,7 @@ static void bt_controller_deinit_internal(void)
esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode) 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) { if (btdm_controller_status != ESP_BT_CONTROLLER_STATUS_INITED) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
@@ -1437,6 +1437,9 @@ error:
#endif #endif
} while (0); } while (0);
#if CONFIG_SW_COEXIST_ENABLE
coex_disable();
#endif
return ret; return ret;
} }

5
components/bt/controller/esp32s3/bt.c
View File

@@ -1428,7 +1428,7 @@ static void bt_controller_deinit_internal(void)
esp_err_t esp_bt_controller_enable(esp_bt_mode_t mode) 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) { if (btdm_controller_status != ESP_BT_CONTROLLER_STATUS_INITED) {
return ESP_ERR_INVALID_STATE; return ESP_ERR_INVALID_STATE;
@@ -1483,6 +1483,9 @@ error:
#endif #endif
} while (0); } while (0);
#if CONFIG_SW_COEXIST_ENABLE
coex_disable();
#endif
return ret; return ret;
} }