Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18d28819 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Greg Kroah-Hartman
Browse files

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: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: default avatarAndreas Werner <andreas.werner@men.de>
Tested-by: default avatarAndreas Werner <andreas.werner@men.de>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bc46b45a

drivers/mcb/mcb-core.c

+16 −3
Original line number Diff line number Diff line
@@ -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);

include/linux/mcb.h

+2 −3
Original line number Diff line number Diff line
@@ -21,13 +21,12 @@ struct mcb_device; 
/**

 * struct mcb_bus - MEN Chameleon Bus

 *

 * @dev: pointer to carrier device

 * @children: the child busses

 * @dev: bus device

 * @carrier: pointer to carrier device

 * @bus_nr: mcb bus number

 * @get_irq: callback to get IRQ number

 */

struct mcb_bus {

	struct list_head children;

	struct device dev;

	struct device *carrier;

	int bus_nr;