From f05868ceef329d400ffab602facc7eaddf80fe25 Mon Sep 17 00:00:00 2001
From: Marcel Holtmann <marcel@holtmann.org>
Date: Sun, 15 Oct 2006 17:30:50 +0200
Subject: [PATCH] --- yaml --- r: 39696 b: refs/heads/master c:
 e9c4bec63eac001651d6d30239dd4175cc3698ef h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 2b78eacbb022..bec23b7b9a59 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: df5c37ea9a3820a9515d8204450aec00f48f8f88
+refs/heads/master: e9c4bec63eac001651d6d30239dd4175cc3698ef
diff --git a/trunk/net/bluetooth/hci_sysfs.c b/trunk/net/bluetooth/hci_sysfs.c
index c7e079d3c486..954eb74eb370 100644
--- a/trunk/net/bluetooth/hci_sysfs.c
+++ b/trunk/net/bluetooth/hci_sysfs.c
@@ -299,11 +299,7 @@ int hci_register_sysfs(struct hci_dev *hdev)
 	BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type);
 
 	dev->class = bt_class;
-
-	if (hdev->parent)
-		dev->parent = hdev->parent;
-	else
-		dev->parent = &bt_platform->dev;
+	dev->parent = hdev->parent;
 
 	strlcpy(dev->bus_id, hdev->name, BUS_ID_SIZE);