diff options
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/bus.c | 7 | ||||
| -rw-r--r-- | drivers/base/driver.c | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/drivers/base/bus.c b/drivers/base/bus.c index e2204da4a4..5251be6b2e 100644 --- a/drivers/base/bus.c +++ b/drivers/base/bus.c @@ -30,10 +30,11 @@ int bus_register(struct bus_type *bus) if (get_bus_by_name(bus->name)) return -EEXIST; - strcpy(bus->dev.name, bus->name); - bus->dev.id = DEVICE_ID_SINGLE; + bus->dev = xzalloc(sizeof(*bus->dev)); + strcpy(bus->dev->name, bus->name); + bus->dev->id = DEVICE_ID_SINGLE; - ret = register_device(&bus->dev); + ret = register_device(bus->dev); if (ret) return ret; diff --git a/drivers/base/driver.c b/drivers/base/driver.c index fa30c68059..487f478d69 100644 --- a/drivers/base/driver.c +++ b/drivers/base/driver.c @@ -135,7 +135,7 @@ int register_device(struct device_d *new_device) if (new_device->bus) { if (!new_device->parent) - new_device->parent = &new_device->bus->dev; + new_device->parent = new_device->bus->dev; list_add_tail(&new_device->bus_list, &new_device->bus->device_list); |