From f39ed35f38b666cb5fd5780fd82d99c0e14565ce Mon Sep 17 00:00:00 2001 From: Dave Young Date: Mon, 11 May 2009 14:18:55 +0800 Subject: [PATCH] --- yaml --- r: 151241 b: refs/heads/master c: 9227c47bbdd87f276e08ed17877cc1649f5ed10a h: refs/heads/master i: 151239: fcce2d27b9ec296c0a0f38b6a6ce6e4dbbbd2d12 v: v3 --- [refs] | 2 +- trunk/drivers/base/sys.c | 8 +++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 305226c9728d..772f28f0c4db 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d9cd8f37855b012757818f31390e8f84db251c89 +refs/heads/master: 9227c47bbdd87f276e08ed17877cc1649f5ed10a diff --git a/trunk/drivers/base/sys.c b/trunk/drivers/base/sys.c index 9742a78c9fe4..162355cd745a 100644 --- a/trunk/drivers/base/sys.c +++ b/trunk/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); }