From: Mark Brown <broonie@kernel.org>
Date: Fri, 11 Dec 2020 17:48:32 +0000 (+0000)
Subject: Merge remote-tracking branch 'regulator/for-5.11' into regulator-next
X-Git-Url: https://repo.jachan.dev/J-linux.git/commitdiff_plain/5e999f10a16b90fc1d5ded8aa365e9804e894aa9

Merge remote-tracking branch 'regulator/for-5.11' into regulator-next
---

5e999f10a16b90fc1d5ded8aa365e9804e894aa9
diff --cc drivers/regulator/core.c
index 42bbd99a36ac,2d5d5f3bac62..ca03d8e70bd1
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@@ -5305,9 -5309,11 +5315,11 @@@ regulator_register(const struct regulat
  		/* FIXME: this currently triggers a chicken-and-egg problem
  		 * when creating -SUPPLY symlink in sysfs to a regulator
  		 * that is just being created */
+ 		rdev_dbg(rdev, "will resolve supply early: %s\n",
+ 			 rdev->supply_name);
  		ret = regulator_resolve_supply(rdev);
  		if (!ret)
 -			ret = set_machine_constraints(rdev, constraints);
 +			ret = set_machine_constraints(rdev);
  		else
  			rdev_dbg(rdev, "unable to resolve supply early: %pe\n",
  				 ERR_PTR(ret));