Skip to contentSkip to conversation

regulator: max20086: fix error code in max20086_parse_regulators_dt()

PATCH In review Dan Carpenter 3 participants 3 messages Jan 11, 2022

Subsystems (3)
Kernel janitors Voltage and current regulator framework Maxim MAX20086 camera power protector driver
lore
Share & tools
lore

Dan Carpenter

author
#0 lore raw

PATCH 1/1 regulator: max20086: fix error code in max20086_parse_regulators_dt()

This code accidentally returns PTR_ERR(NULL) which is success. It should return a negative error code.

Fixes bfff546aae50 ("regulator: Add MAX20086-MAX20089 driver")
Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/regulator/max20086-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/max20086-regulator.c +1 -1
index fbc56b043071..63aa6ec3254a 100644
@@ -140,7 +140,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)
Signature · 1 line
2.20.1
maintainer Reviewed-by on v1 1/1
#1 lore raw

Hi Dan,

Thank you for the patch.

Quoted 2 lines · Dan Carpenter

This code accidentally returns PTR_ERR(NULL) which is success. It should return a negative error code.

Oops, sorry.

Reviewed-by Laurent Pinchart <[email protected]>
Quoted 19 lines
Fixes bfff546aae50 ("regulator: Add MAX20086-MAX20089 driver")
Signed-off-by Dan Carpenter <[email protected]>
---
 drivers/regulator/max20086-regulator.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/regulator/max20086-regulator.c +1 -1
index fbc56b043071..63aa6ec3254a 100644
@@ -140,7 +140,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)
Signature · 3 lines
Regards,

Laurent Pinchart
maintainer
#2 lore raw
In reply to Dan Carpenter
Quoted 4 lines · Dan Carpenter

This code accidentally returns PTR_ERR(NULL) which is success. It should return a negative error code.

Applied to

https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-linus

Thanks!

[1/1] regulator: max20086: fix error code in max20086_parse_regulators_dt()

      commit: 879cf8006475642b747aaaa4d06f7044ab2de794

All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying to this mail.

Thanks,
Mark