From 3c027cfaf6172cc8ac8cd4a65bce013d78d766f1 Mon Sep 17 00:00:00 2001 From: "Gustavo F. Padovan" Date: Tue, 15 Feb 2011 20:22:03 -0300 Subject: [PATCH] --- yaml --- r: 237403 b: refs/heads/master c: c6f3c5f7f2938d2809bcc15889e9aa212038a554 h: refs/heads/master i: 237401: a94869b82515a33adcfd43f9ee3d915ec8b3f72d 237399: c9a2355d66178474e51ca30e76ff6ed21597427b v: v3 --- [refs] | 2 +- trunk/net/bluetooth/hci_core.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index affe87e8c5bb..21a94b72acdb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: de73115a7d67e1b81dbde2285a7657f3e3867703 +refs/heads/master: c6f3c5f7f2938d2809bcc15889e9aa212038a554 diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c index 173bebd42825..c01415bc8946 100644 --- a/trunk/net/bluetooth/hci_core.c +++ b/trunk/net/bluetooth/hci_core.c @@ -1199,6 +1199,8 @@ int hci_unregister_dev(struct hci_dev *hdev) hci_unregister_sysfs(hdev); + hci_del_off_timer(hdev); + destroy_workqueue(hdev->workqueue); hci_dev_lock_bh(hdev);