From 4964dbe583acb7b57186731a16e2ee29c5be7e4a Mon Sep 17 00:00:00 2001 From: Ulisses Furquim Date: Mon, 30 Jan 2012 18:26:29 -0200 Subject: [PATCH] --- yaml --- r: 290903 b: refs/heads/master c: 127074bfa3c11c12e0160437e31b08c6b27412a4 h: refs/heads/master i: 290901: 38b3134c3f38297467c0afe3c9a337b8f4b45ec1 290899: a07ae452df70c5bdec174912cb13d1b27a60412c 290895: 37c2fd3010746a97494ea9f91dafb3ae89e5aa8c v: v3 --- [refs] | 2 +- trunk/net/bluetooth/l2cap_core.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 6c2d227d36d1..f1b9d28653ae 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 17cd3f374be6648bd46c86ff8f2a2511d3f416ee +refs/heads/master: 127074bfa3c11c12e0160437e31b08c6b27412a4 diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c index ae7fb27525d3..09cd8601ea81 100644 --- a/trunk/net/bluetooth/l2cap_core.c +++ b/trunk/net/bluetooth/l2cap_core.c @@ -1016,10 +1016,10 @@ static void l2cap_conn_del(struct hci_conn *hcon, int err) hci_chan_del(conn->hchan); 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)) { - __cancel_delayed_work(&conn->security_timer); + cancel_delayed_work_sync(&conn->security_timer); smp_chan_destroy(conn); }