1 files changed, 38 insertions, 7 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index df7fdabd0730..b1ea4df85c7d 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -456,6 +456,35 @@ static void class_device_remove_attrs(struct class_device * cd)
         }
 }
 
+static int class_device_add_groups(struct class_device * cd)
+{
+        int i;
+        int error = 0;
+
+        if (cd->groups) {
+                for (i = 0; cd->groups[i]; i++) {
+                        error = sysfs_create_group(&cd->kobj, cd->groups[i]);
+                        if (error) {
+                                while (--i >= 0)
+                                        sysfs_remove_group(&cd->kobj, cd->groups[i]);
+                                goto out;
+                        }
+                }
+        }
+out:
+        return error;
+}
+
+static void class_device_remove_groups(struct class_device * cd)
+{
+        int i;
+        if (cd->groups) {
+                for (i = 0; cd->groups[i]; i++) {
+                        sysfs_remove_group(&cd->kobj, cd->groups[i]);
+                }
+        }
+}
+
 static ssize_t show_dev(struct class_device *class_dev, char *buf)
 {
         return print_dev_t(buf, class_dev->devt);
@@ -559,17 +588,18 @@ int class_device_add(struct class_device *class_dev)
                                   class_name);
         }
 
+        class_device_add_groups(class_dev);
+
         kobject_uevent(&class_dev->kobj, KOBJ_ADD);
 
         /* notify any interfaces this device is now here */
-        if (parent_class) {
-                down(&parent_class->sem);
-                list_add_tail(&class_dev->node, &parent_class->children);
-                list_for_each_entry(class_intf, &parent_class->interfaces, node)
-                        if (class_intf->add)
-                                class_intf->add(class_dev, class_intf);
-                up(&parent_class->sem);
+        down(&parent_class->sem);
+        list_add_tail(&class_dev->node, &parent_class->children);
+        list_for_each_entry(class_intf, &parent_class->interfaces, node) {
+                if (class_intf->add)
+                        class_intf->add(class_dev, class_intf);
         }
+        up(&parent_class->sem);
 
  register_done:
         if (error) {
@@ -673,6 +703,7 @@ void class_device_del(struct class_device *class_dev)
         if (class_dev->devt_attr)
                 class_device_remove_file(class_dev, class_dev->devt_attr);
         class_device_remove_attrs(class_dev);
+        class_device_remove_groups(class_dev);
 
         kobject_uevent(&class_dev->kobj, KOBJ_REMOVE);
         kobject_del(&class_dev->kobj);