X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=drivers%2Fbase%2Fsys.c;h=b0d55a9308550889c83b4ca6e77b8e1009315342;hb=9213980e6a70d8473e0ffd4b39ab5b6caaba9ff5;hp=420cb3cf616f3181735e06ea957457ca68b5728b;hpb=c449269f45c2cdf53af08c8d0af37472f66539d9;p=linux-2.6.git diff --git a/drivers/base/sys.c b/drivers/base/sys.c index 420cb3cf6..b0d55a930 100644 --- a/drivers/base/sys.c +++ b/drivers/base/sys.c @@ -180,8 +180,11 @@ int sysdev_register(struct sys_device * sysdev) /* But make sure we point to the right type for sysfs translation */ sysdev->kobj.ktype = &ktype_sysdev; - kobject_set_name(&sysdev->kobj,"%s%d", + error = kobject_set_name(&sysdev->kobj,"%s%d", kobject_name(&cls->kset.kobj),sysdev->id); + if (error) + return error; + pr_debug("Registering sys device '%s'\n",kobject_name(&sysdev->kobj)); /* Register the object */