소스 검색

fix bluedroid deinit crash

zwj 5 년 전
부모
커밋
ea42d8e043
3개의 변경된 파일2개의 추가작업 그리고 6개의 파일을 삭제
  1. 1 1
      components/bt/controller/lib
  2. 1 1
      components/bt/host/bluedroid/stack/btm/btm_ble_bgconn.c
  3. 0 4
      components/bt/host/bluedroid/stack/l2cap/l2c_main.c

+ 1 - 1
components/bt/controller/lib

@@ -1 +1 @@
-Subproject commit ca8f5c602ec2948a31146b5f5e429dea369060a4
+Subproject commit 006f49fde59374b54cb23e066c5ec8f10da28da1

+ 1 - 1
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) {

+ 0 - 4
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);
         }
     }