Skip to content

Commit 9e15510

Browse files
committed
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()
2 parents 83c2713 + b4c18c1 commit 9e15510

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

drivers/regulator/max20086-regulator.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77

88
#include <linux/err.h>
99
#include <linux/gpio.h>
10+
#include <linux/gpio/consumer.h>
1011
#include <linux/i2c.h>
1112
#include <linux/module.h>
1213
#include <linux/regmap.h>
@@ -140,7 +141,7 @@ static int max20086_parse_regulators_dt(struct max20086 *chip, bool *boot_on)
140141
node = of_get_child_by_name(chip->dev->of_node, "regulators");
141142
if (!node) {
142143
dev_err(chip->dev, "regulators node not found\n");
143-
return PTR_ERR(node);
144+
return -ENODEV;
144145
}
145146

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

0 commit comments

Comments
 (0)