summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-01-24 16:31:00 +0300
committerMark Brown <broonie@kernel.org>2022-01-24 16:31:00 +0300
commit799f9cf8fd45f59369ffca28369a4ac5e02f1904 (patch)
tree60c27bb858cd7d13c9d6f5c8185c601ac53942cf /drivers
parente783362eb54cd99b2cac8b3a9aeac942e6f6ac07 (diff)
parentb4c18c18ebf7cf1e602af88c12ef9cb0d6e5ce51 (diff)
downloadlinux-799f9cf8fd45f59369ffca28369a4ac5e02f1904.tar.xz
Merge existing fixes from regulator/for-5.17 into new branch
Diffstat (limited to 'drivers')
-rw-r--r--drivers/regulator/max20086-regulator.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/max20086-regulator.c b/drivers/regulator/max20086-regulator.c
index fbc56b043071..b8bf76c170fe 100644
--- a/drivers/regulator/max20086-regulator.c
+++ b/drivers/regulator/max20086-regulator.c
@@ -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)