aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorStephen Rothwell <sfr@canb.auug.org.au>2010-03-01 04:38:36 -0500
committerGreg Kroah-Hartman <gregkh@suse.de>2010-03-07 20:04:52 -0500
commit62e877b893e6350c900d381f353aa62ed48dcc97 (patch)
treed2021f2c688207b1301ce016e7d7a73f77df8c11 /include
parent0f4288ec6fcc1a47d1fa0241ec1c6dacd5a09e96 (diff)
sysfs: fix for thinko with sysfs_bin_attr_init()
After merging the final tree, today's linux-next build (powerpc allyesconfig) failed like this: drivers/pci/pci-sysfs.c: In function 'pci_create_legacy_files': drivers/pci/pci-sysfs.c:645: error: lvalue required as unary '&' operand drivers/pci/pci-sysfs.c:658: error: lvalue required as unary '&' operand Caused by commit "sysfs: Use sysfs_attr_init and sysfs_bin_attr_init on dynamic attributes" interacting with commit "sysfs: Use one lockdep class per sysfs attribute") both from the driver-core tree. Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> Cc: "Eric W. Biederman" <ebiederm@xmission.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'include')
-rw-r--r--include/linux/sysfs.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/sysfs.h b/include/linux/sysfs.h
index d77cde6d0498..f0496b3d1811 100644
--- a/include/linux/sysfs.h
+++ b/include/linux/sysfs.h
@@ -110,7 +110,7 @@ struct bin_attribute {
110 * enabled. Lockdep gives a nice error when your attribute is 110 * enabled. Lockdep gives a nice error when your attribute is
111 * added to sysfs if you don't have this. 111 * added to sysfs if you don't have this.
112 */ 112 */
113#define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&bin_attr->attr) 113#define sysfs_bin_attr_init(bin_attr) sysfs_attr_init(&(bin_attr)->attr)
114 114
115struct sysfs_ops { 115struct sysfs_ops {
116 ssize_t (*show)(struct kobject *, struct attribute *,char *); 116 ssize_t (*show)(struct kobject *, struct attribute *,char *);