mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-28 18:51:56 -04:00
mcb: Correctly initialize the bus's device
The mcb bus' device member wasn't correctly initialized and thus wasn't placed correctly into the driver model. Signed-off-by: Johannes Thumshirn <[email protected]> Reviewed-by: Andreas Werner <[email protected]> Tested-by: Andreas Werner <[email protected]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
This commit is contained in:
parent
bc46b45a42
commit
18d2881980
2 changed files with 18 additions and 6 deletions
|
|
@ -187,6 +187,7 @@ struct mcb_bus *mcb_alloc_bus(struct device *carrier)
|
|||
{
|
||||
struct mcb_bus *bus;
|
||||
int bus_nr;
|
||||
int rc;
|
||||
|
||||
bus = kzalloc(sizeof(struct mcb_bus), GFP_KERNEL);
|
||||
if (!bus)
|
||||
|
|
@ -194,14 +195,26 @@ struct mcb_bus *mcb_alloc_bus(struct device *carrier)
|
|||
|
||||
bus_nr = ida_simple_get(&mcb_ida, 0, 0, GFP_KERNEL);
|
||||
if (bus_nr < 0) {
|
||||
kfree(bus);
|
||||
return ERR_PTR(bus_nr);
|
||||
rc = bus_nr;
|
||||
goto err_free;
|
||||
}
|
||||
|
||||
INIT_LIST_HEAD(&bus->children);
|
||||
bus->bus_nr = bus_nr;
|
||||
bus->carrier = carrier;
|
||||
|
||||
device_initialize(&bus->dev);
|
||||
bus->dev.parent = carrier;
|
||||
bus->dev.bus = &mcb_bus_type;
|
||||
|
||||
dev_set_name(&bus->dev, "mcb:%d", bus_nr);
|
||||
rc = device_add(&bus->dev);
|
||||
if (rc)
|
||||
goto err_free;
|
||||
|
||||
return bus;
|
||||
err_free:
|
||||
kfree(bus);
|
||||
return ERR_PTR(rc);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(mcb_alloc_bus);
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue