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

Commit e2c98eaf authored by Shawn Guo's avatar Shawn Guo Committed by Mark Brown
Browse files

regulator: core: remove sysfs entry properly in regulator_put 



With changes introduced by commit 222cc7b1 (regulator: core: Allow
multiple requests of a single supply mapping) on create_regulator,
regulator_put needs a corresponding update on sysfs entry removing.

Also regulator->dev still needs to get assigned in create_regulator,
otherwise, sysfs_remove_link call in regulator_put will get bypassed.

Reported-by: default avatarFabio Estevam <festevam@gmail.com>
Tested-by: default avatarDong Aisheng <dong.aisheng@linaro.org>
Signed-off-by: default avatarShawn Guo <shawn.guo@linaro.org>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent e113d792

drivers/regulator/core.c

+3 −4
Original line number Diff line number Diff line
@@ -1063,6 +1063,8 @@ static struct regulator *create_regulator(struct regulator_dev *rdev, 
	list_add(&regulator->list, &rdev->consumer_list);



	if (dev) {

		regulator->dev = dev;



		/* Add a link to the device sysfs entry */

		size = scnprintf(buf, REG_STR_SIZE, "%s-%s",

				 dev->kobj.name, supply_name);
@@ -1359,11 +1361,8 @@ void regulator_put(struct regulator *regulator) 
	debugfs_remove_recursive(regulator->debugfs);



	/* remove any sysfs entries */

	if (regulator->dev) {

	if (regulator->dev)

		sysfs_remove_link(&rdev->dev.kobj, regulator->supply_name);

		device_remove_file(regulator->dev, &regulator->dev_attr);

		kfree(regulator->dev_attr.attr.name);

	}

	kfree(regulator->supply_name);

	list_del(&regulator->list);

	kfree(regulator);