diff options
| -rw-r--r-- | drivers/base/bus.c | 11 | ||||
| -rw-r--r-- | drivers/base/sys.c | 5 |
2 files changed, 13 insertions, 3 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index c17668d9f536..b40af6a72afe 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -451,7 +451,11 @@ int bus_add_driver(struct device_driver * drv) if (bus) { pr_debug("bus %s: add driver %s\n",bus->name,drv->name); - kobject_set_name(&drv->kobj,drv->name); + error = kobject_set_name(&drv->kobj,drv->name); + if (error) { + put_bus(bus); + return error; + } drv->kobj.kset = &bus->drivers; if ((error = kobject_register(&drv->kobj))) { put_bus(bus); @@ -557,7 +561,10 @@ int bus_register(struct bus_type * bus) { int retval; - kobject_set_name(&bus->subsys.kset.kobj,bus->name); + retval = kobject_set_name(&bus->subsys.kset.kobj,bus->name); + if (retval) + goto out; + subsys_set_kset(bus,bus_subsys); retval = subsystem_register(&bus->subsys); if (retval) diff --git a/drivers/base/sys.c b/drivers/base/sys.c index 420cb3cf616f..b0d55a930855 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 */ |