Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master

1 files changed, 1 insertions, 0 deletions

diff --git a/drivers/base/attribute_container.c b/drivers/base/attribute_container.c
index b9cda053d3c0..8fc200b2e2c0 100644
--- a/drivers/base/attribute_container.c
+++ b/drivers/base/attribute_container.c
@@ -328,6 +328,7 @@ attribute_container_add_attrs(struct device *classdev)
                 return sysfs_create_group(&classdev->kobj, cont->grp);
 
         for (i = 0; attrs[i]; i++) {
+                sysfs_attr_init(&attrs[i]->attr);
                 error = device_create_file(classdev, attrs[i]);
                 if (error)
                         return error;