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

Commit 01e86f49 authored by Mark Brown's avatar Mark Brown
Browse files

regulator: core: Complain if we can't reenable a supply 



When cleaning up after a failed bulk_disable() we try to reenable any
supplies that we did manage to disable - complain if we fail to do that
when we try.

Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent dd775ae2

drivers/regulator/core.c

+7 −3
Original line number Diff line number Diff line
@@ -2566,7 +2566,7 @@ int regulator_bulk_disable(int num_consumers, 
			   struct regulator_bulk_data *consumers)

{

	int i;

	int ret;

	int ret, r;



	for (i = num_consumers - 1; i >= 0; --i) {

		ret = regulator_disable(consumers[i].consumer);
@@ -2578,8 +2578,12 @@ int regulator_bulk_disable(int num_consumers, 


err:

	pr_err("Failed to disable %s: %d\n", consumers[i].supply, ret);

	for (++i; i < num_consumers; ++i)

		regulator_enable(consumers[i].consumer);

	for (++i; i < num_consumers; ++i) {

		r = regulator_enable(consumers[i].consumer);

		if (r != 0)

			pr_err("Failed to reename %s: %d\n",

			       consumers[i].supply, r);

	}



	return ret;

}