From 54f5a54de51615fd2aaf98ce22bb0b607dde03e2 Mon Sep 17 00:00:00 2001
From: Gustavo Padovan <gustavo.padovan@collabora.co.uk>
Date: Wed, 21 Nov 2012 00:50:21 -0200
Subject: [PATCH] --- yaml --- r: 341945 b: refs/heads/master c:
 b9b5ef188e5a2222cfc16ef62a4703080750b451 h: refs/heads/master i:   341943:
 15ed11c67954a112ceff0a52f2b68865aecbcf15 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 e7138e01b8b3..1a044c66d7b2 100644
--- 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
index 81f4bac098c9..69eb644f0d48 100644
--- 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);