Merge branch 'cherry-pick-3c082b47' into 'release/v2.1'

Merge branch 'bugfix/bt_avdt_state_machine' into 'master'

See merge request !948
This commit is contained in:
Ivan Grokhotkov 2017-07-04 17:28:17 +08:00
commit 9deaa6ab60

View File

@ -956,7 +956,11 @@ void avdt_scb_hdl_tc_close(tAVDT_SCB *p_scb, tAVDT_SCB_EVT *p_data)
/* set up hdr */ /* set up hdr */
avdt_ctrl.hdr.err_code = p_scb->close_code; avdt_ctrl.hdr.err_code = p_scb->close_code;
avdt_ctrl.hdr.err_param = p_data->close.disc_rsn; if (p_data) {
avdt_ctrl.hdr.err_param = p_data->close.disc_rsn;
} else {
avdt_ctrl.hdr.err_param = AVDT_DISC_RSN_NORMAL;
}
/* clear sep variables */ /* clear sep variables */
avdt_scb_clr_vars(p_scb, p_data); avdt_scb_clr_vars(p_scb, p_data);