---

yaml --- r: 341945 b: refs/heads/master c: b9b5ef1 h: refs/heads/master i: 341943: 15ed11c v: v3
git-mirror · Dec 3, 2012 · 54f5a54 · 54f5a54
1 parent 1812fde
commit 54f5a54
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: dc2a0e20fbc85a71c63aa4330b496fda33f6bf80
+refs/heads/master: b9b5ef188e5a2222cfc16ef62a4703080750b451
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
@@ -1854,6 +1854,8 @@ void hci_unregister_dev(struct hci_dev *hdev)
 	for (i = 0; i < NUM_REASSEMBLY; i++)
 		kfree_skb(hdev->reassembly[i]);
 
+	cancel_work_sync(&hdev->power_on);
+
 	if (!test_bit(HCI_INIT, &hdev->flags) &&
 	    !test_bit(HCI_SETUP, &hdev->dev_flags)) {
 		hci_dev_lock(hdev);