diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 13:39:42 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-03-19 13:39:42 -0700 |
commit | 2eb645e7b5662da47646f76b41b4141f2c9bf13a (patch) | |
tree | b5b99f8111a72a81d085cc3e3acca706de43062e /drivers/infiniband | |
parent | 8fdb7e9f612b7c6ba6c3ba460c14263b5ce90f79 (diff) | |
parent | 12ee3c0a0ac42bed0939420468fd35f5cdceae4f (diff) | |
download | linux-3.10-2eb645e7b5662da47646f76b41b4141f2c9bf13a.tar.gz linux-3.10-2eb645e7b5662da47646f76b41b4141f2c9bf13a.tar.bz2 linux-3.10-2eb645e7b5662da47646f76b41b4141f2c9bf13a.zip |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core-2.6:
driver core: numa: fix BUILD_BUG_ON for node_read_distance
driver-core: document ERR_PTR() return values
kobject: documentation: Update to refer to kset-example.c.
sysdev: the cpu probe/release attributes should be sysdev_class_attributes
kobject: documentation: Fix erroneous example in kobject doc.
driver-core: fix missing kernel-doc in firmware_class
Driver core: Early platform kernel-doc update
sysfs: fix sysfs lockdep warning in mlx4 code
sysfs: fix sysfs lockdep warning in infiniband code
sysfs: fix sysfs lockdep warning in ipmi code
sysfs: Initialised pci bus legacy_mem field before use
sysfs: use sysfs_bin_attr_init in firmware class driver
Diffstat (limited to 'drivers/infiniband')
-rw-r--r-- | drivers/infiniband/core/sysfs.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/infiniband/core/sysfs.c b/drivers/infiniband/core/sysfs.c index 1558bb7fc74..f901957abc8 100644 --- a/drivers/infiniband/core/sysfs.c +++ b/drivers/infiniband/core/sysfs.c @@ -461,6 +461,7 @@ alloc_group_attrs(ssize_t (*show)(struct ib_port *, element->attr.attr.mode = S_IRUGO; element->attr.show = show; element->index = i; + sysfs_attr_init(&element->attr.attr); tab_attr[i] = &element->attr.attr; } |