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

Commit 3fc99e38 authored by Michał Mirosław's avatar Michał Mirosław Committed by Greg Kroah-Hartman
Browse files

regulator: resolve supply after creating regulator 



[ Upstream commit aea6cb99703e17019e025aa71643b4d3e0a24413 ]

When creating a new regulator its supply cannot create the sysfs link
because the device is not yet published. Remove early supply resolving
since it will be done later anyway. This makes the following error
disappear and the symlinks get created instead.

  DCDC_REG1: supplied by VSYS
  VSYS: could not add device link regulator.3 err -2

Note: It doesn't fix the problem for bypassed regulators, though.

Fixes: 45389c47 ("regulator: core: Add early supply resolution for regulators")
Signed-off-by: default avatarMichał Mirosław <mirq-linux@rere.qmqm.pl>
Link: https://lore.kernel.org/r/ba09e0a8617ffeeb25cb4affffe6f3149319cef8.1601155770.git.mirq-linux@rere.qmqm.pl


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 0284adc4

drivers/regulator/core.c

+13 −8
Original line number Original line Diff line number Diff line
@@ -4363,15 +4363,20 @@ regulator_register(const struct regulator_desc *regulator_desc, 
	else if (regulator_desc->supply_name)

	else if (regulator_desc->supply_name)

		rdev->supply_name = regulator_desc->supply_name;

		rdev->supply_name = regulator_desc->supply_name;





	/*

	 * Attempt to resolve the regulator supply, if specified,

	 * but don't return an error if we fail because we will try

	 * to resolve it again later as more regulators are added.

	 */

	if (regulator_resolve_supply(rdev))

		rdev_dbg(rdev, "unable to resolve supply\n");



	ret = set_machine_constraints(rdev, constraints);

	ret = set_machine_constraints(rdev, constraints);

	if (ret == -EPROBE_DEFER) {

		/* Regulator might be in bypass mode and so needs its supply

		 * to set the constraints */

		/* FIXME: this currently triggers a chicken-and-egg problem

		 * when creating -SUPPLY symlink in sysfs to a regulator

		 * that is just being created */

		ret = regulator_resolve_supply(rdev);

		if (!ret)

			ret = set_machine_constraints(rdev, constraints);

		else

			rdev_dbg(rdev, "unable to resolve supply early: %pe\n",

				 ERR_PTR(ret));

	}

	if (ret < 0)

	if (ret < 0)

		goto wash;

		goto wash;