From ea42d8e043a82e6a8732a54d4ca6a2f3d9dcfaa8 Mon Sep 17 00:00:00 2001 From: zwj Date: Fri, 15 Jan 2021 14:40:57 +0800 Subject: [PATCH] fix bluedroid deinit crash --- components/bt/controller/lib | 2 +- components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c | 2 +- components/bt/host/bluedroid/stack/l2cap/l2c_main.c | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/components/bt/controller/lib b/components/bt/controller/lib index ca8f5c602e..006f49fde5 160000 --- a/components/bt/controller/lib +++ b/components/bt/controller/lib @@ -1 +1 @@ -Subproject commit ca8f5c602ec2948a31146b5f5e429dea369060a4 +Subproject commit 006f49fde59374b54cb23e066c5ec8f10da28da1 diff --git a/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c b/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c index 43481fd020..a15f40c8b8 100644 --- a/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c +++ b/components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c @@ -320,7 +320,7 @@ BOOLEAN btm_update_dev_to_white_list(BOOLEAN to_add, BD_ADDR bd_addr, tBLE_ADDR_ } } - + tBTM_BLE_CB *p_cb = &btm_cb.ble_ctr_cb; if (to_add && p_cb->white_list_avail_size == 0) { diff --git a/components/bt/host/bluedroid/stack/l2cap/l2c_main.c b/components/bt/host/bluedroid/stack/l2cap/l2c_main.c index 1f4847bd94..bb8c603c48 100644 --- a/components/bt/host/bluedroid/stack/l2cap/l2c_main.c +++ b/components/bt/host/bluedroid/stack/l2cap/l2c_main.c @@ -896,8 +896,6 @@ void l2c_free_p_lcb_pool(void) p_lcb = list_node(p_node); if (p_lcb) { l2cu_release_lcb (p_lcb); - list_remove(l2cb.p_lcb_pool, p_lcb); - osi_free(p_lcb); } } @@ -912,8 +910,6 @@ void l2c_free_p_ccb_pool(void) p_ccb = list_node(p_node); if (p_ccb) { l2cu_release_ccb (p_ccb); - list_remove(l2cb.p_ccb_pool, p_ccb); - osi_free(p_ccb); } }