summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris Morgan <macromorgan@hotmail.com>2021-07-21 11:57:16 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2025-12-03 12:45:18 +0100
commit81e24e73ca7383ba4b2c1ee49f0f0bfce3d17a48 (patch)
tree03ba7780a337724831267d0c846b23e56c825336
parentb38db473f546cd5b71f7e3405d2f7b01bd9c60cf (diff)
regulator: fixed: use dev_err_probe for register
[ Upstream commit d0f95e6496a974a890df5eda65ffaee66ab0dc73 ] Instead of returning error directly, use dev_err_probe. This avoids messages in the dmesg log for devices which will be probed again later. Signed-off-by: Chris Morgan <macromorgan@hotmail.com> Link: https://lore.kernel.org/r/20210721165716.19915-1-macroalpha82@gmail.com Signed-off-by: Mark Brown <broonie@kernel.org> Stable-dep-of: 636f4618b1cd ("regulator: fixed: fix GPIO descriptor leak on register failure") Signed-off-by: Sasha Levin <sashal@kernel.org>
-rw-r--r--drivers/regulator/fixed.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/fixed.c b/drivers/regulator/fixed.c
index 2f0bed86467f..529f40124324 100644
--- a/drivers/regulator/fixed.c
+++ b/drivers/regulator/fixed.c
@@ -244,8 +244,9 @@ static int reg_fixed_voltage_probe(struct platform_device *pdev)
drvdata->dev = devm_regulator_register(&pdev->dev, &drvdata->desc,
&cfg);
if (IS_ERR(drvdata->dev)) {
- ret = PTR_ERR(drvdata->dev);
- dev_err(&pdev->dev, "Failed to register regulator: %d\n", ret);
+ ret = dev_err_probe(&pdev->dev, PTR_ERR(drvdata->dev),
+ "Failed to register regulator: %ld\n",
+ PTR_ERR(drvdata->dev));
return ret;
}