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

Commit 0f1d747b authored by Mike Rapoport's avatar Mike Rapoport Committed by Liam Girdwood
Browse files

regulator: add unset_regulator_supplies to fix regulator_unregister 



Currently regulator_unregister does not clear regulator <--> consumer
mapping.
This patch introduces unset_regulator_supplies that clear the map.

Signed-off-by: default avatarMike Rapoport <mike@compulab.co.il>
Acked-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Signed-off-by: default avatarLiam Girdwood <lrg@slimlogic.co.uk>
parent 90ca563b

drivers/regulator/core.c

+14 −0
Original line number Diff line number Diff line
@@ -831,6 +831,19 @@ static void unset_consumer_device_supply(struct regulator_dev *rdev, 
	}

}



static void unset_regulator_supplies(struct regulator_dev *rdev)

{

	struct regulator_map *node, *n;



	list_for_each_entry_safe(node, n, &regulator_map_list, list) {

		if (rdev == node->regulator) {

			list_del(&node->list);

			kfree(node);

			return;

		}

	}

}



#define REG_STR_SIZE	32



static struct regulator *create_regulator(struct regulator_dev *rdev,
@@ -1970,6 +1983,7 @@ void regulator_unregister(struct regulator_dev *rdev) 
		return;



	mutex_lock(&regulator_list_mutex);

	unset_regulator_supplies(rdev);

	list_del(&rdev->list);

	if (rdev->supply)

		sysfs_remove_link(&rdev->dev.kobj, "supply");