From 00a8d77f457711353701b62f569ee557249ab21f Mon Sep 17 00:00:00 2001
From: Dave Young <hidave.darkstar@gmail.com>
Date: Sat, 29 Dec 2007 19:17:47 -0800
Subject: [PATCH] --- yaml --- r: 75225 b: refs/heads/master c:
 38b7da09cfdb2202f08476d6fb22a47649a177ec h: refs/heads/master i:   75223:
 f2b0b8cadee9c337116235b103c114cb93832b43 v: v3

---
 [refs]                          |  2 +-
 trunk/net/bluetooth/hci_conn.c  | 10 +---------
 trunk/net/bluetooth/hci_sysfs.c |  1 +
 3 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 49e6e8da5a2b..52569ba5b8f3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2072c228c9a05c004a230620196da7607cdcc5b6
+refs/heads/master: 38b7da09cfdb2202f08476d6fb22a47649a177ec
diff --git a/trunk/net/bluetooth/hci_conn.c b/trunk/net/bluetooth/hci_conn.c
index 9483320f6dad..34d1a3c822bf 100644
--- a/trunk/net/bluetooth/hci_conn.c
+++ b/trunk/net/bluetooth/hci_conn.c
@@ -259,22 +259,14 @@ int hci_conn_del(struct hci_conn *conn)
 	}
 
 	tasklet_disable(&hdev->tx_task);
-
-	hci_conn_del_sysfs(conn);
-
 	hci_conn_hash_del(hdev, conn);
 	if (hdev->notify)
 		hdev->notify(hdev, HCI_NOTIFY_CONN_DEL);
-
 	tasklet_enable(&hdev->tx_task);
-
 	skb_queue_purge(&conn->data_q);
-
+	hci_conn_del_sysfs(conn);
 	hci_dev_put(hdev);
 
-	/* will free via device release */
-	put_device(&conn->dev);
-
 	return 0;
 }
 
diff --git a/trunk/net/bluetooth/hci_sysfs.c b/trunk/net/bluetooth/hci_sysfs.c
index cef1e3e1881c..cad510309dcf 100644
--- a/trunk/net/bluetooth/hci_sysfs.c
+++ b/trunk/net/bluetooth/hci_sysfs.c
@@ -320,6 +320,7 @@ static void del_conn(struct work_struct *work)
 {
 	struct hci_conn *conn = container_of(work, struct hci_conn, work);
 	device_del(&conn->dev);
+	put_device(&conn->dev);
 }
 
 void hci_conn_del_sysfs(struct hci_conn *conn)