Commit d567f5db authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'regulator-fix-v5.17-rc4' of... 

Merge tag 'regulator-fix-v5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fix from Mark Brown:
 "One fix here, for initialisation of regulators that don't have an
  in_enabled() operation which would mainly impact cases where they
  aren't otherwise used during early setup for some reason"

* tag 'regulator-fix-v5.17-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: core: fix false positive in regulator_late_cleanup()
parents 754e0b0e 4e2a354e

drivers/regulator/core.c

+3 −10
Original line number Diff line number Diff line
@@ -6014,9 +6014,8 @@ core_initcall(regulator_init); 
static int regulator_late_cleanup(struct device *dev, void *data)

{

	struct regulator_dev *rdev = dev_to_rdev(dev);

	const struct regulator_ops *ops = rdev->desc->ops;

	struct regulation_constraints *c = rdev->constraints;

	int enabled, ret;

	int ret;



	if (c && c->always_on)

		return 0;
@@ -6029,14 +6028,8 @@ static int regulator_late_cleanup(struct device *dev, void *data) 
	if (rdev->use_count)

		goto unlock;



	/* If we can't read the status assume it's always on. */

	if (ops->is_enabled)

		enabled = ops->is_enabled(rdev);

	else

		enabled = 1;



	/* But if reading the status failed, assume that it's off. */

	if (enabled <= 0)

	/* If reading the status failed, assume that it's off. */

	if (_regulator_is_enabled(rdev) <= 0)

		goto unlock;



	if (have_full_constraints()) {