aboutsummaryrefslogtreecommitdiffstats
path: root/net/bluetooth/l2cap_core.c
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/l2cap_core.c')
-rw-r--r--net/bluetooth/l2cap_core.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/bluetooth/l2cap_core.c b/net/bluetooth/l2cap_core.c
index ae7fb27525d..09cd8601ea8 100644
--- a/net/bluetooth/l2cap_core.c
+++ b/net/bluetooth/l2cap_core.c
@@ -1016,10 +1016,10 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err)
1016 hci_chan_del(conn->hchan); 1016 hci_chan_del(conn->hchan);
1017 1017
1018 if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_SENT) 1018 if (conn->info_state & L2CAP_INFO_FEAT_MASK_REQ_SENT)
1019 __cancel_delayed_work(&conn->info_timer); 1019 cancel_delayed_work_sync(&conn->info_timer);
1020 1020
1021 if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags)) { 1021 if (test_and_clear_bit(HCI_CONN_LE_SMP_PEND, &hcon->flags)) {
1022 __cancel_delayed_work(&conn->security_timer); 1022 cancel_delayed_work_sync(&conn->security_timer);
1023 smp_chan_destroy(conn); 1023 smp_chan_destroy(conn);
1024 } 1024 }
1025 1025