espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-07-30 10:47:19 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
bugfix/Fixed the issue of alarm leak (v4.4)

See merge request espressif/esp-idf!24353
This commit is contained in:
Jiang Jiang Jian
2023-06-28 10:04:26 +08:00
parent 4aee26535d 28747f432f
commit ddae3618dd
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
components/bt/host/bluedroid/bta/av/bta_av_act.c
View File

@ -1861,8 +1861,8 @@ void bta_av_dereg_comp(tBTA_AV_DATA *p_data)
bta_sys_remove_uuid(UUID_SERVCLASS_VIDEO_SOURCE); bta_sys_remove_uuid(UUID_SERVCLASS_VIDEO_SOURCE);
} }
/* make sure that the timer is not active */ /* free the delay timer for AVRC CT */
bta_sys_stop_timer(&p_scb->timer); bta_sys_free_timer(&p_scb->timer);
list_free(p_scb->a2d_list); list_free(p_scb->a2d_list);
p_scb->a2d_list = NULL; p_scb->a2d_list = NULL;
utl_freebuf((void **)&p_cb->p_scb[p_scb->hdi]); utl_freebuf((void **)&p_cb->p_scb[p_scb->hdi]);

6
components/bt/host/bluedroid/bta/hf_ag/bta_ag_main.c
View File

@ -461,11 +461,11 @@ void bta_ag_scb_dealloc(tBTA_AG_SCB *p_scb)
APPL_TRACE_DEBUG("bta_ag_scb_dealloc %d", bta_ag_scb_to_idx(p_scb)); APPL_TRACE_DEBUG("bta_ag_scb_dealloc %d", bta_ag_scb_to_idx(p_scb));
/* stop timers */ /* stop timers */
bta_sys_stop_timer(&p_scb->act_timer); bta_sys_free_timer(&p_scb->act_timer);
#if (BTM_WBS_INCLUDED == TRUE) #if (BTM_WBS_INCLUDED == TRUE)
bta_sys_stop_timer(&p_scb->cn_timer); bta_sys_free_timer(&p_scb->cn_timer);
#endif #endif
bta_sys_stop_timer(&p_scb->colli_timer); bta_sys_free_timer(&p_scb->colli_timer);
/* initialize control block */ /* initialize control block */
memset(p_scb, 0, sizeof(tBTA_AG_SCB)); memset(p_scb, 0, sizeof(tBTA_AG_SCB));