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/btdm_make_failed_due_to_macro' into 'master'

Browse Source 
components/bt: Fix make errors due to macro usage error

See merge request idf/esp-idf!5105
This commit is contained in:
Jiang Jiang Jian 2019-06-19 14:44:02 +08:00
commit 28e0a17e0a
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
components/bt/bluedroid/btc/profile/std/hf_client/bta_hf_client_co.c
View File

@ -216,9 +216,13 @@ void bta_hf_client_sco_co_open(UINT16 handle, UINT8 air_mode, UINT8 inout_pkt_si
bta_hf_enc_init(); bta_hf_enc_init();
return; return;
} else {
return;
// Nothing to do
}
error_exit:;
#if (HFP_DYNAMIC_MEMORY == TRUE) #if (HFP_DYNAMIC_MEMORY == TRUE)
error_exit:;
if (bta_hf_client_co_cb_ptr) { if (bta_hf_client_co_cb_ptr) {
osi_free(bta_hf_client_co_cb_ptr); osi_free(bta_hf_client_co_cb_ptr);
bta_hf_client_co_cb_ptr = NULL; bta_hf_client_co_cb_ptr = NULL;
@ -230,12 +234,7 @@ error_exit:;
bta_hf_ct_plc_ptr = NULL; bta_hf_ct_plc_ptr = NULL;
} }
#endif ///(PLC_INCLUDED == TRUE) #endif ///(PLC_INCLUDED == TRUE)
#endif /// (HFP_DYNAMIC_MEMORY == TRUE) #endif /// (HFP_DYNAMIC_MEMORY == TRUE)
} else {
// Nothing to do
}
return; return;
} }