diff options
| author | Dmitry Osipenko <digetx@gmail.com> | 2021-07-05 23:12:11 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-09-15 09:50:23 +0200 |
| commit | 7bb6302e9d0966d9467785e8cc4d3baa0321168d (patch) | |
| tree | 0790325761026ae2557a1debb75c0f88d2e2bb26 | |
| parent | a85985099644700f365743986eb7f24f83c7cad6 (diff) | |
| download | linux-stable-7bb6302e9d0966d9467785e8cc4d3baa0321168d.tar.gz linux-stable-7bb6302e9d0966d9467785e8cc4d3baa0321168d.tar.bz2 linux-stable-7bb6302e9d0966d9467785e8cc4d3baa0321168d.zip | |
regulator: tps65910: Silence deferred probe error
[ Upstream commit e301df76472cc929fa62d923bc3892931f7ad71d ]
The TPS65910 regulator now gets a deferred probe until supply regulator is
registered. Silence noisy error message about the deferred probe.
Reported-by: Matt Merhar <mattmerhar@protonmail.com> # Ouya T30
Tested-by: Matt Merhar <mattmerhar@protonmail.com> # Ouya T30
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Link: https://lore.kernel.org/r/20210705201211.16082-1-digetx@gmail.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | drivers/regulator/tps65910-regulator.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/drivers/regulator/tps65910-regulator.c b/drivers/regulator/tps65910-regulator.c index 1d5b0a1b86f7..06cbe60c990f 100644 --- a/drivers/regulator/tps65910-regulator.c +++ b/drivers/regulator/tps65910-regulator.c @@ -1211,12 +1211,10 @@ static int tps65910_probe(struct platform_device *pdev) rdev = devm_regulator_register(&pdev->dev, &pmic->desc[i], &config); - if (IS_ERR(rdev)) { - dev_err(tps65910->dev, - "failed to register %s regulator\n", - pdev->name); - return PTR_ERR(rdev); - } + if (IS_ERR(rdev)) + return dev_err_probe(tps65910->dev, PTR_ERR(rdev), + "failed to register %s regulator\n", + pdev->name); /* Save regulator for cleanup */ pmic->rdev[i] = rdev; |