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

Commit 4d2ec857 authored by Johannes Thumshirn's avatar Johannes Thumshirn Committed by Greg Kroah-Hartman
Browse files

mcb: Acquire reference to carrier module in core 



Acquire a reference to the carrier's kernel module in bus code, so
it can't be removed from the kernel while it still has a bus and thus
possibly devices attached to it.

Signed-off-by: default avatarJohannes Thumshirn <jthumshirn@suse.de>
Reported-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 7bc36409

drivers/mcb/mcb-core.c

+15 −1
Original line number Diff line number Diff line
@@ -61,22 +61,36 @@ static int mcb_probe(struct device *dev) 
	struct mcb_driver *mdrv = to_mcb_driver(dev->driver);

	struct mcb_device *mdev = to_mcb_device(dev);

	const struct mcb_device_id *found_id;

	struct module *carrier_mod;

	int ret;



	found_id = mcb_match_id(mdrv->id_table, mdev);

	if (!found_id)

		return -ENODEV;



	carrier_mod = mdev->dev.parent->driver->owner;

	if (!try_module_get(carrier_mod))

		return -EINVAL;



	get_device(dev);

	return mdrv->probe(mdev, found_id);

	ret = mdrv->probe(mdev, found_id);

	if (ret)

		module_put(carrier_mod);



	return ret;

}



static int mcb_remove(struct device *dev)

{

	struct mcb_driver *mdrv = to_mcb_driver(dev->driver);

	struct mcb_device *mdev = to_mcb_device(dev);

	struct module *carrier_mod;



	mdrv->remove(mdev);



	carrier_mod = mdev->dev.parent->driver->owner;

	module_put(carrier_mod);



	put_device(&mdev->dev);



	return 0;