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

Commit 7055a314 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branch 'regulator/fix/core' into regulator-linus

parents 52721d9d 9f7e25ed

drivers/regulator/core.c

+7 −3
Original line number Diff line number Diff line
@@ -1381,10 +1381,14 @@ static int regulator_resolve_supply(struct regulator_dev *rdev) 
	}



	if (!r) {

		if (have_full_constraints()) {

			r = dummy_regulator_rdev;

		} else {

			dev_err(dev, "Failed to resolve %s-supply for %s\n",

				rdev->supply_name, rdev->desc->name);

			return -EPROBE_DEFER;

		}

	}



	/* Recursively resolve the supply of the supply */

	ret = regulator_resolve_supply(r);