From 82378549d4da57043e5d3f92b50a6a38e949818d Mon Sep 17 00:00:00 2001
From: Dave Young <hidave.darkstar@gmail.com>
Date: Sat, 21 Feb 2009 16:13:34 +0800
Subject: [PATCH] --- yaml --- r: 134745 b: refs/heads/master c:
 2ae9a6be5f476f3512839a4d11a8f432bfd2914c h: refs/heads/master i:   134743:
 76a9b79f7348124b12318df3bba3e108dc8b3356 v: v3

---
 [refs]                          | 2 +-
 trunk/net/bluetooth/hci_conn.c  | 4 ++--
 trunk/net/bluetooth/hci_event.c | 2 --
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index f334eee6c16d..22f92c9c018a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2526d3d8b2f671a7d36cc486af984052cd5a690f
+refs/heads/master: 2ae9a6be5f476f3512839a4d11a8f432bfd2914c
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
index efd5c926cc1b..1181db08d9de 100644
--- a/trunk/net/bluetooth/hci_conn.c
+++ b/trunk/net/bluetooth/hci_conn.c
@@ -287,6 +287,8 @@ int hci_conn_del(struct hci_conn *conn)
 
 	skb_queue_purge(&conn->data_q);
 
+	hci_conn_del_sysfs(conn);
+
 	return 0;
 }
 
@@ -560,8 +562,6 @@ void hci_conn_hash_flush(struct hci_dev *hdev)
 
 		c->state = BT_CLOSED;
 
-		hci_conn_del_sysfs(c);
-
 		hci_proto_disconn_cfm(c, 0x16);
 		hci_conn_del(c);
 	}
diff --git a/trunk/net/bluetooth/hci_event.c b/trunk/net/bluetooth/hci_event.c
index c396542c2b82..55534244c3a0 100644
--- a/trunk/net/bluetooth/hci_event.c
+++ b/trunk/net/bluetooth/hci_event.c
@@ -1019,8 +1019,6 @@ static inline void hci_disconn_complete_evt(struct hci_dev *hdev, struct sk_buff
 	if (conn) {
 		conn->state = BT_CLOSED;
 
-		hci_conn_del_sysfs(conn);
-
 		hci_proto_disconn_cfm(conn, ev->reason);
 		hci_conn_del(conn);
 	}