From 3e298736a05eddc403cfe9a28bee6904cb535055 Mon Sep 17 00:00:00 2001
From: Johan Hedberg <johan.hedberg@nokia.com>
Date: Tue, 4 Jan 2011 12:08:50 +0200
Subject: [PATCH] --- yaml --- r: 232469 b: refs/heads/master c:
 e2e0cacbd4b0c7c69c7591d37c243f2363aeaa71 h: refs/heads/master i:   232467:
 9dcdc5b7110ca694b6e4be621ed180346201d3ca v: v3

---
 [refs]                         | 2 +-
 trunk/net/bluetooth/hci_core.c | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 57bb2d1c04ef..a55477a3b624 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4571928fc73589e9c5217cd069d2c0b4ff1818a8
+refs/heads/master: e2e0cacbd4b0c7c69c7591d37c243f2363aeaa71
diff --git a/trunk/net/bluetooth/hci_core.c b/trunk/net/bluetooth/hci_core.c
index 8b602d881fd7..9c4541bc488a 100644
--- a/trunk/net/bluetooth/hci_core.c
+++ b/trunk/net/bluetooth/hci_core.c
@@ -1011,6 +1011,10 @@ int hci_unregister_dev(struct hci_dev *hdev)
 
 	destroy_workqueue(hdev->workqueue);
 
+	hci_dev_lock_bh(hdev);
+	hci_blacklist_clear(hdev);
+	hci_dev_unlock_bh(hdev);
+
 	__hci_dev_put(hdev);
 
 	return 0;