From 1e6c206ac38c0847030b0317e130f4f179049e9b Mon Sep 17 00:00:00 2001 From: Ulisses Furquim Date: Mon, 30 Jan 2012 18:26:29 -0200 Subject: [PATCH] --- yaml --- r: 287965 b: refs/heads/master c: 24d2b8c0ac5c8ec41c26ed432238b0e027184882 h: refs/heads/master i: 287963: 9eff361e7a8e7a29ec220af63671b750f4b7feac 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 a2adfdbe8ad1..66b87172474c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6de32750822d00bfa92c341166132b0714c5b559 +refs/heads/master: 24d2b8c0ac5c8ec41c26ed432238b0e027184882 diff --git a/trunk/net/bluetooth/l2cap_core.c b/trunk/net/bluetooth/l2cap_core.c index ec10c698b891..32d338c30e65 100644 --- a/trunk/net/bluetooth/l2cap_core.c +++ b/trunk/net/bluetooth/l2cap_core.c @@ -1018,10 +1018,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->pend)) { - __cancel_delayed_work(&conn->security_timer); + cancel_delayed_work_sync(&conn->security_timer); smp_chan_destroy(conn); }