From baa743c7b9faf95c9d096ea4b7ad0a91833e89ec Mon Sep 17 00:00:00 2001 From: Jiang Jiang Jian Date: Thu, 6 Jul 2017 14:48:29 +0800 Subject: [PATCH] Merge branch 'bugfix/btdm_error_length_unit' into 'master' Component/bt: fix bug for error length unit See merge request !950 --- components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c | 2 +- components/bt/bluedroid/stack/l2cap/l2c_ble.c | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c b/components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c index c55201c76..bfaa1cb7a 100644 --- a/components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c +++ b/components/bt/bluedroid/btc/profile/std/gatt/btc_gatts.c @@ -138,7 +138,7 @@ void btc_gatts_arg_deep_copy(btc_msg_t *msg, void *p_dest, void *p_src) break; } case BTC_GATTS_ACT_SET_ATTR_VALUE:{ - uint8_t len = src->set_attr_val.length; + uint16_t len = src->set_attr_val.length; if(src->set_attr_val.value){ dst->set_attr_val.value = (uint8_t *)GKI_getbuf(len); if(dst->set_attr_val.value != NULL){ diff --git a/components/bt/bluedroid/stack/l2cap/l2c_ble.c b/components/bt/bluedroid/stack/l2cap/l2c_ble.c index d6fc16cca..d30dc1cdc 100644 --- a/components/bt/bluedroid/stack/l2cap/l2c_ble.c +++ b/components/bt/bluedroid/stack/l2cap/l2c_ble.c @@ -554,7 +554,6 @@ void l2cble_process_conn_update_evt (UINT16 handle, UINT8 status, UINT16 conn_in tL2C_LCB *p_lcb; L2CAP_TRACE_DEBUG("l2cble_process_conn_update_evt"); - L2CAP_TRACE_WARNING("l2cble_process_conn_update_evt: status: %d", status); /* See if we have a link control block for the remote device */ p_lcb = l2cu_find_lcb_by_handle(handle); if (!p_lcb) {