Skip to contentSkip to conversation

regulator: fp9931: Fix error handling for optional regulator

PATCH In review Robby Cai 3 participants 6 messages Mar 12 – Mar 13

Subsystems (2)
lore
Share & tools
lore

Robby Cai

author
#0 lore raw

PATCH 1/1 regulator: fp9931: Fix error handling for optional regulator

If "vin" reg does not exist in the device tree, the regulator framework returns -ENODEV, which is normal for an optional supply. But the current code treats -ENODEV as a fatal error, causing the driver probe to fail. This patch fixes that by handling -ENODEV correctly for optional regulator.

Fixes 12d821bd13d4 ("regulator: Add FP9931/JD9930 driver")
---
 drivers/regulator/fp9931.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/regulator/fp9931.c +7 -3
index 7fbcc6327cc63..fa7f32adfb666 100644
@@ -448,9 +448,13 @@ static int fp9931_probe(struct i2c_client *client)
 				     "failed to allocate regmap!\n");
 
 	data->vin_reg = devm_regulator_get_optional(&client->dev, "vin");
-	if (IS_ERR(data->vin_reg))
-		return dev_err_probe(&client->dev, PTR_ERR(data->vin_reg),
-				     "failed to get vin regulator\n");
+	if (IS_ERR(data->vin_reg)) {
+		if (PTR_ERR(data->vin_reg) != -ENODEV)
+			return dev_err_probe(&client->dev, PTR_ERR(data->vin_reg),
+					     "failed to get vin regulator\n");
+
+		data->vin_reg = NULL;
+	}
 
 	data->pgood_gpio = devm_gpiod_get(&client->dev, "pg", GPIOD_IN);
 	if (IS_ERR(data->pgood_gpio))
Signature · 1 line
2.37.1
maintainer
#1 lore raw
Quoted 4 lines · Robby Cai

If "vin" reg does not exist in the device tree, the regulator framework returns -ENODEV, which is normal for an optional supply. But the current code treats -ENODEV as a fatal error, causing the driver probe to fail. This patch fixes that by handling -ENODEV correctly for optional regulator.

Applied to

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

Thanks!

[1/1] regulator: fp9931: Fix error handling for optional regulator

      commit: 8066a5855ed986f822df4d8b1fa8017b88a43e76

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

#2 lore raw
In reply to Robby Cai
Quoted 16 lines · On Thu, 12 Mar 2026 12:01:48 +0800 Robby Cai <[email protected]> wrote:

If "vin" reg does not exist in the device tree, the regulator framework returns -ENODEV, which is normal for an optional supply. But the current code treats -ENODEV as a fatal error, causing the driver probe to fail. This patch fixes that by handling -ENODEV correctly for optional regulator.

Fixes 12d821bd13d4 ("regulator: Add FP9931/JD9930 driver")
---
 drivers/regulator/fp9931.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/regulator/fp9931.c +0 -0
index 7fbcc6327cc63..fa7f32adfb666 100644

drivers/regulator/fp9931.c static int fp9931_probe(struct i2c_client *client) · line 450

Quoted 3 lines
drivers/regulator/fp9931.c +0 -0
@@ -448,9 +448,13 @@ static int fp9931_probe(struct i2c_client *client)
 				     "failed to allocate regmap!\n");
 
 	data->vin_reg = devm_regulator_get_optional(&client->dev, "vin");

looking at that thing again. I think I have abused the optional api. Of course this chip needs a supply. It may be hardwired so something not switchable. But that needs to be wired to something... So I think rather the _optional is wrong here.

Regards,
Andreas

maintainer
#3 lore raw
Quoted 8 lines · Andreas Kemnade
Quoted 1 line · Robby Cai

data->vin_reg = devm_regulator_get_optional(&client->dev, "vin");

looking at that thing again. I think I have abused the optional api. Of course this chip needs a supply. It may be hardwired so something not switchable. But that needs to be wired to something... So I think rather the _optional is wrong here.

If it's a mandatory supply that's right, I may have misunderstood what the supply was doing when I originally reviewed this.

author
#5 lore raw
In reply to Andreas Kemnade
Quoted 28 lines · Andreas Kemnade
Quoted 16 lines · On Thu, 12 Mar 2026 12:01:48 +0800 Robby Cai <[email protected]> wrote:

If "vin" reg does not exist in the device tree, the regulator framework returns -ENODEV, which is normal for an optional supply. But the current code treats -ENODEV as a fatal error, causing the driver probe to fail. This patch fixes that by handling -ENODEV correctly for optional regulator.

Fixes 12d821bd13d4 ("regulator: Add FP9931/JD9930 driver")
---
 drivers/regulator/fp9931.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)
drivers/regulator/fp9931.c +0 -0
index 7fbcc6327cc63..fa7f32adfb666 100644

drivers/regulator/fp9931.c static int fp9931_probe(struct i2c_client *client) · line 450

Quoted 3 lines
drivers/regulator/fp9931.c +0 -0
@@ -448,9 +448,13 @@ static int fp9931_probe(struct i2c_client *client)
 				     "failed to allocate regmap!\n");
 
 	data->vin_reg = devm_regulator_get_optional(&client->dev, "vin");

looking at that thing again. I think I have abused the optional api. Of course this chip needs a supply. It may be hardwired so something not switchable. But that needs to be wired to something... So I think rather the _optional is wrong here.

Quoted 2 lines

Regards,
Andreas

Thanks for the review. That's right. I'll send out new patch for review.

Regards,
Robby

author
#4 lore raw
In reply to Mark Brown
Quoted 5 lines · Mark Brown
Quoted 3 lines · Andreas Kemnade
Quoted 1 line · Robby Cai

data->vin_reg = devm_regulator_get_optional(&client->dev, "vin");

Quoted 7 lines
Quoted 4 lines

looking at that thing again. I think I have abused the optional api. Of course this chip needs a supply. It may be hardwired so something not switchable. But that needs to be wired to something... So I think rather the _optional is wrong here.

If it's a mandatory supply that's right, I may have misunderstood what the supply was doing when I originally reviewed this.

Thanks for the review. This does make sense. I'll send out patch v2 soon.

Regards,
Robby