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

Commit 1e4b545c authored by Nishanth Menon's avatar Nishanth Menon Committed by Mark Brown
Browse files

regulator: core: return err value for regulator_get if there is no DT binding 



commit 6d191a5f
(regulator: core: Don't defer probe if there's no DT binding for a supply)

Attempted to differentiate between regulator_get() with an actual
DT binding for the supply and when there is none to avoid unnecessary
deferal.
However, ret value supplied by regulator_dev_lookup() is being
ignored by regulator_get(). So, exit with the appropriate return value.

Signed-off-by: default avatarNishanth Menon <nm@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
parent 0f7b87f0

drivers/regulator/core.c

+10 −1
Original line number Diff line number Diff line
@@ -1229,7 +1229,7 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, 
	struct regulator_dev *rdev;

	struct regulator *regulator = ERR_PTR(-EPROBE_DEFER);

	const char *devname = NULL;

	int ret;

	int ret = 0;



	if (id == NULL) {

		pr_err("get() with no identifier\n");
@@ -1245,6 +1245,15 @@ static struct regulator *_regulator_get(struct device *dev, const char *id, 
	if (rdev)

		goto found;



	/*

	 * If we have return value from dev_lookup fail, we do not expect to

	 * succeed, so, quit with appropriate error value

	 */

	if (ret) {

		regulator = ERR_PTR(ret);

		goto out;

	}



	if (board_wants_dummy_regulator) {

		rdev = dummy_regulator_rdev;

		goto found;