---

yaml --- r: 237403 b: refs/heads/master c: c6f3c5f h: refs/heads/master i: 237401: a94869b 237399: c9a2355 v: v3
git-mirror · Feb 16, 2011 · 3c027cf · 3c027cf
1 parent 2faef1b
commit 3c027cf
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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);