4 files changed, 11 insertions, 0 deletions

diff --git a/drivers/macintosh/windfarm_core.c b/drivers/macintosh/windfarm_core.c
index c092354591bb..ce8897933a84 100644
--- a/drivers/macintosh/windfarm_core.c
+++ b/drivers/macintosh/windfarm_core.c
@@ -210,6 +210,7 @@ int wf_register_control(struct wf_control *new_ct)
         kref_init(&new_ct->ref);
         list_add(&new_ct->link, &wf_controls);
 
+        sysfs_attr_init(&new_ct->attr.attr);
         new_ct->attr.attr.name = new_ct->name;
         new_ct->attr.attr.mode = 0644;
         new_ct->attr.show = wf_show_control;
diff --git a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
index 6c23456e0bda..71f50565f637 100644
--- a/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
+++ b/drivers/media/video/pvrusb2/pvrusb2-sysfs.c
@@ -423,10 +423,12 @@ static void pvr2_sysfs_add_debugifc(struct pvr2_sysfs *sfp)
 
         dip = kzalloc(sizeof(*dip),GFP_KERNEL);
         if (!dip) return;
+        sysfs_attr_init(&dip->attr_debugcmd.attr);
         dip->attr_debugcmd.attr.name = "debugcmd";
         dip->attr_debugcmd.attr.mode = S_IRUGO|S_IWUSR|S_IWGRP;
         dip->attr_debugcmd.show = debugcmd_show;
         dip->attr_debugcmd.store = debugcmd_store;
+        sysfs_attr_init(&dip->attr_debuginfo.attr);
         dip->attr_debuginfo.attr.name = "debuginfo";
         dip->attr_debuginfo.attr.mode = S_IRUGO;
         dip->attr_debuginfo.show = debuginfo_show;
@@ -644,6 +646,7 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 return;
         }
 
+        sysfs_attr_init(&sfp->attr_v4l_minor_number.attr);
         sfp->attr_v4l_minor_number.attr.name = "v4l_minor_number";
         sfp->attr_v4l_minor_number.attr.mode = S_IRUGO;
         sfp->attr_v4l_minor_number.show = v4l_minor_number_show;
@@ -658,6 +661,7 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 sfp->v4l_minor_number_created_ok = !0;
         }
 
+        sysfs_attr_init(&sfp->attr_v4l_radio_minor_number.attr);
         sfp->attr_v4l_radio_minor_number.attr.name = "v4l_radio_minor_number";
         sfp->attr_v4l_radio_minor_number.attr.mode = S_IRUGO;
         sfp->attr_v4l_radio_minor_number.show = v4l_radio_minor_number_show;
@@ -672,6 +676,7 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 sfp->v4l_radio_minor_number_created_ok = !0;
         }
 
+        sysfs_attr_init(&sfp->attr_unit_number.attr);
         sfp->attr_unit_number.attr.name = "unit_number";
         sfp->attr_unit_number.attr.mode = S_IRUGO;
         sfp->attr_unit_number.show = unit_number_show;
@@ -685,6 +690,7 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 sfp->unit_number_created_ok = !0;
         }
 
+        sysfs_attr_init(&sfp->attr_bus_info.attr);
         sfp->attr_bus_info.attr.name = "bus_info_str";
         sfp->attr_bus_info.attr.mode = S_IRUGO;
         sfp->attr_bus_info.show = bus_info_show;
@@ -699,6 +705,7 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 sfp->bus_info_created_ok = !0;
         }
 
+        sysfs_attr_init(&sfp->attr_hdw_name.attr);
         sfp->attr_hdw_name.attr.name = "device_hardware_type";
         sfp->attr_hdw_name.attr.mode = S_IRUGO;
         sfp->attr_hdw_name.show = hdw_name_show;
@@ -713,6 +720,7 @@ static void class_dev_create(struct pvr2_sysfs *sfp,
                 sfp->hdw_name_created_ok = !0;
         }
 
+        sysfs_attr_init(&sfp->attr_hdw_desc.attr);
         sfp->attr_hdw_desc.attr.name = "device_hardware_description";
         sfp->attr_hdw_desc.attr.mode = S_IRUGO;
         sfp->attr_hdw_desc.show = hdw_desc_show;
diff --git a/drivers/platform/x86/intel_menlow.c b/drivers/platform/x86/intel_menlow.c
index 1190bad4297f..2f795ce2b939 100644
--- a/drivers/platform/x86/intel_menlow.c
+++ b/drivers/platform/x86/intel_menlow.c
@@ -397,6 +397,7 @@ static int intel_menlow_add_one_attribute(char *name, int mode, void *show,
         if (!attr)
                 return -ENOMEM;
 
+        sysfs_attr_init(&attr->attr.attr); /* That is consistent naming :D */
         attr->attr.attr.name = name;
         attr->attr.attr.mode = mode;
         attr->attr.show = show;
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index 4637bcbe03a4..994358a4f302 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1536,6 +1536,7 @@ static int __devinit fsl_diu_probe(struct of_device *ofdev,
                 goto error;
         }
 
+        sysfs_attr_init(&machine_data->dev_attr.attr);
         machine_data->dev_attr.attr.name = "monitor";
         machine_data->dev_attr.attr.mode = S_IRUGO|S_IWUSR;
         machine_data->dev_attr.show = show_monitor;