Commit 9e155101 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull regulator fixes from Mark Brown:
 "A couple of very minor fixes for the regulator framework, nothing at
  all urgent here"

* tag 'regulator-fix-v5.17-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: MAX20086: add gpio/consumer.h
  regulator: max20086: fix error code in max20086_parse_regulators_dt()
parents 83c2713a b4c18c18

drivers/regulator/max20086-regulator.c

+2 −1
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 


#include <linux/err.h>

#include <linux/gpio.h>

#include <linux/gpio/consumer.h>

#include <linux/i2c.h>

#include <linux/module.h>

#include <linux/regmap.h>
@@ -140,7 +141,7 @@ static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on) 
	node = of_get_child_by_name(chip->dev->of_node, "regulators");

	if (!node) {

		dev_err(chip->dev, "regulators node not found\n");

		return PTR_ERR(node);

		return -ENODEV;

	}



	for (i = 0; i < chip->info->num_outputs; ++i)