Merge commit 'v2.6.34-rc1' into for-linus

1 files changed, 15 insertions, 3 deletions

diff --git a/drivers/base/class.c b/drivers/base/class.c
index 161746deab4b..0147f476b8a9 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -31,7 +31,7 @@ static ssize_t class_attr_show(struct kobject *kobj, struct attribute *attr,
         ssize_t ret = -EIO;
 
         if (class_attr->show)
-                ret = class_attr->show(cp->class, buf);
+                ret = class_attr->show(cp->class, class_attr, buf);
         return ret;
 }
 
@@ -43,7 +43,7 @@ static ssize_t class_attr_store(struct kobject *kobj, struct attribute *attr,
         ssize_t ret = -EIO;
 
         if (class_attr->store)
-                ret = class_attr->store(cp->class, buf, count);
+                ret = class_attr->store(cp->class, class_attr, buf, count);
         return ret;
 }
 
@@ -59,9 +59,11 @@ static void class_release(struct kobject *kobj)
         else
                 pr_debug("class '%s' does not have a release() function, "
                          "be careful\n", class->name);
+
+        kfree(cp);
 }
 
-static struct sysfs_ops class_sysfs_ops = {
+static const struct sysfs_ops class_sysfs_ops = {
         .show   = class_attr_show,
         .store  = class_attr_store,
 };
@@ -488,6 +490,16 @@ void class_interface_unregister(struct class_interface *class_intf)
         class_put(parent);
 }
 
+ssize_t show_class_attr_string(struct class *class, struct class_attribute *attr,
+                                char *buf)
+{
+        struct class_attribute_string *cs;
+        cs = container_of(attr, struct class_attribute_string, attr);
+        return snprintf(buf, PAGE_SIZE, "%s\n", cs->str);
+}
+
+EXPORT_SYMBOL_GPL(show_class_attr_string);
+
 struct class_compat {
         struct kobject *kobj;
 };