|
@@ -1016,10 +1016,10 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
|
|
hci_chan_del(conn->hchan);
|
|
hci_chan_del(conn->hchan);
|
|
|
|
|
|
if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_SENT)
|
|
if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_SENT)
|
|
- __cancel_delayed_work(&conn->info_timer);
|
|
|
|
|
|
+ cancel_delayed_work_sync(&conn->info_timer);
|
|
|
|
|
|
if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags)) {
|
|
if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags)) {
|
|
- __cancel_delayed_work(&conn->security_timer);
|
|
|
|
|
|
+ cancel_delayed_work_sync(&conn->security_timer);
|
|
smp_chan_destroy(conn);
|
|
smp_chan_destroy(conn);
|
|
}
|
|
}
|
|
|
|
|