mirror of
https://github.com/espressif/esp-idf.git
synced 2025-07-30 18:57:19 +02:00
Merge branch 'bugfix/coex_enable_disable_not_in_pairs_v4.4' into 'release/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
This commit is contained in:
@ -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 @@ error:
|
||||
#endif
|
||||
} while (0);
|
||||
|
||||
#if CONFIG_SW_COEXIST_ENABLE
|
||||
coex_disable();
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
@ -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 @@ error:
|
||||
#endif
|
||||
} while (0);
|
||||
|
||||
#if CONFIG_SW_COEXIST_ENABLE
|
||||
coex_disable();
|
||||
#endif
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user