From db8a90d8301d7ee13b61af24af1ef64623d39c9e Mon Sep 17 00:00:00 2001
From: Dave Young <hidave.darkstar@gmail.com>
Date: Sun, 18 Oct 2009 20:24:41 +0000
Subject: [PATCH] --- yaml --- r: 167703 b: refs/heads/master c:
 f74c77cb1124a11acf69c98d10c0fdc22f322664 h: refs/heads/master i:   167701:
 d9fc41355a355c1b30744a3fee41c471b4edc0f4   167699:
 d686582d09f26cebba9c98a99d74fb7719cb8bdf   167695:
 586068635c09d7c6906f289496a90fc3ef8e2319 v: v3

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

diff --git a/[refs] b/[refs]
index 9fdd979dfc1c..02226badd3a7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: b103cf34382f26ff48a87931b83f13b177b47c1a
+refs/heads/master: f74c77cb1124a11acf69c98d10c0fdc22f322664
diff --git a/trunk/net/bluetooth/hci_sysfs.c b/trunk/net/bluetooth/hci_sysfs.c
index 7f939ce29801..2bc6f6a8de68 100644
--- a/trunk/net/bluetooth/hci_sysfs.c
+++ b/trunk/net/bluetooth/hci_sysfs.c
@@ -92,6 +92,8 @@ static void add_conn(struct work_struct *work)
 
 	dev_set_name(&conn->dev, "%s:%d", hdev->name, conn->handle);
 
+	dev_set_drvdata(&conn->dev, conn);
+
 	if (device_add(&conn->dev) < 0) {
 		BT_ERR("Failed to register connection device");
 		return;
@@ -144,8 +146,6 @@ void hci_conn_init_sysfs(struct hci_conn *conn)
 	conn->dev.class = bt_class;
 	conn->dev.parent = &hdev->dev;
 
-	dev_set_drvdata(&conn->dev, conn);
-
 	device_initialize(&conn->dev);
 
 	INIT_WORK(&conn->work_add, add_conn);