diff --git a/[refs] b/[refs] index 0758932e038d..a3df79b3f767 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a989705c4cf6e6c1a339c95f9daf658b4ba88ca8 +refs/heads/master: d12db0b08f6c14dfd1438f6f6ad49dcd663c9ae5 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);