From fd5b9def2be2e471afa6aaac670e0535937905c7 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Mon, 7 May 2007 17:35:42 -0700 Subject: [PATCH] --- yaml --- r: 54521 b: refs/heads/master c: 5b94f675f57e4ff16c8fda09088d7480a84dcd91 h: refs/heads/master i: 54519: dc0635c8c372193b23e3783c141d6447deeb0af6 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 8b0414656029..dc2b9d13f875 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d679f805e7d16291f7671710dd42522561a46611 +refs/heads/master: 5b94f675f57e4ff16c8fda09088d7480a84dcd91 diff --git a/trunk/net/bluetooth/hci_sysfs.c b/trunk/net/bluetooth/hci_sysfs.c index 359e3440cf29..25835403d659 100644 --- a/trunk/net/bluetooth/hci_sysfs.c +++ b/trunk/net/bluetooth/hci_sysfs.c @@ -322,7 +322,7 @@ int hci_register_sysfs(struct hci_dev *hdev) if (device_create_file(dev, bt_attrs[i]) < 0) BT_ERR("Failed to create device attribute"); - if (sysfs_create_link(&bt_class->subsys.kset.kobj, + if (sysfs_create_link(&bt_class->subsys.kobj, &dev->kobj, kobject_name(&dev->kobj)) < 0) BT_ERR("Failed to create class symlink"); @@ -333,7 +333,7 @@ void hci_unregister_sysfs(struct hci_dev *hdev) { BT_DBG("%p name %s type %d", hdev, hdev->name, hdev->type); - sysfs_remove_link(&bt_class->subsys.kset.kobj, + sysfs_remove_link(&bt_class->subsys.kobj, kobject_name(&hdev->dev.kobj)); device_del(&hdev->dev);