1 files changed, 7 insertions, 1 deletions

diff --git a/drivers/base/sys.c b/drivers/base/sys.c
index 9742a78c9fe..162355cd745 100644
--- a/drivers/base/sys.c
+++ b/drivers/base/sys.c
@@ -131,6 +131,8 @@ static struct kset *system_kset;
 
 int sysdev_class_register(struct sysdev_class *cls)
 {
+        int retval;
+
         pr_debug("Registering sysdev class '%s'\n", cls->name);
 
         INIT_LIST_HEAD(&cls->drivers);
@@ -138,7 +140,11 @@ int sysdev_class_register(struct sysdev_class *cls)
         cls->kset.kobj.parent = &system_kset->kobj;
         cls->kset.kobj.ktype = &ktype_sysdev_class;
         cls->kset.kobj.kset = system_kset;
-        kobject_set_name(&cls->kset.kobj, cls->name);
+
+        retval = kobject_set_name(&cls->kset.kobj, cls->name);
+        if (retval)
+                return retval;
+
         return kset_register(&cls->kset);
 }