diff options
| author | Linus Torvalds | 2022-02-01 12:37:20 -0800 |
|---|---|---|
| committer | Linus Torvalds | 2022-02-01 12:37:20 -0800 |
| commit | 9e155101c24adb32b26475ca09bab93cf8fd80c6 (patch) | |
| tree | d92a74d486806752e2f8a044eb535e1e4dfa26fb /drivers | |
| parent | 83c2713a6754815c4f533097914a8d4fbe85dcf1 (diff) | |
| parent | b4c18c18ebf7cf1e602af88c12ef9cb0d6e5ce51 (diff) | |
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()
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/regulator/max20086-regulator.c | 3 |
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) |