diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2007-05-07 00:27:53 -0700 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2007-05-07 00:27:53 -0700 |
commit | d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86 (patch) | |
tree | 61af7e7d4cdf7994f2bd6ffb8263f82fe304ea4c /net/bluetooth/hci_sysfs.c | |
parent | 823036ed3291e30f32a905c94db821cd75524b59 (diff) | |
parent | 7bb078cba9ef55d810275b533747fa96a12e1823 (diff) | |
download | kernel_samsung_aries-d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86.zip kernel_samsung_aries-d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86.tar.gz kernel_samsung_aries-d5bb306b42e39ffecaf85d1f9d04a3b5d9a97c86.tar.bz2 |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/holtmann/bluetooth-2.6
Diffstat (limited to 'net/bluetooth/hci_sysfs.c')
-rw-r--r-- | net/bluetooth/hci_sysfs.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/net/bluetooth/hci_sysfs.c b/net/bluetooth/hci_sysfs.c index 801d687..359e344 100644 --- a/net/bluetooth/hci_sysfs.c +++ b/net/bluetooth/hci_sysfs.c @@ -305,7 +305,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; + dev->bus = &bt_bus; dev->parent = hdev->parent; strlcpy(dev->bus_id, hdev->name, BUS_ID_SIZE); @@ -322,6 +322,10 @@ 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, + &dev->kobj, kobject_name(&dev->kobj)) < 0) + BT_ERR("Failed to create class symlink"); + return 0; } @@ -329,6 +333,9 @@ 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, + kobject_name(&hdev->dev.kobj)); + device_del(&hdev->dev); } |