summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
Diffstat (limited to 'drivers')
-rw-r--r--drivers/base/class.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/drivers/base/class.c b/drivers/base/class.c
index 1befa1107437..f6a96e931788 100644
--- a/drivers/base/class.c
+++ b/drivers/base/class.c
@@ -102,13 +102,21 @@ void class_put(struct class * cls)
int class_register(struct class * cls)
{
+ int error;
+
pr_debug("device class '%s': registering\n",cls->name);
INIT_LIST_HEAD(&cls->children);
INIT_LIST_HEAD(&cls->interfaces);
- kobject_set_name(&cls->subsys.kset.kobj,cls->name);
+ error = kobject_set_name(&cls->subsys.kset.kobj,cls->name);
+ if (error)
+ return error;
+
subsys_set_kset(cls,class_subsys);
- subsystem_register(&cls->subsys);
+
+ error = subsystem_register(&cls->subsys);
+ if (error)
+ return error;
return 0;
}