Messages in this thread Patch in this message | | | From | Mark Brown <> | Subject | Applied "regulator: uniphier: Fix probe error handling" to the regulator tree | Date | Sat, 2 Feb 2019 16:18:35 +0000 (GMT) |
| |
The patch
regulator: uniphier: Fix probe error handling
has been applied to the regulator tree at
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
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
From 33cd870c4bf148163e8b7c6e3bac2a44658a04e4 Mon Sep 17 00:00:00 2001 From: Axel Lin <axel.lin@ingics.com> Date: Wed, 30 Jan 2019 15:11:09 +0800 Subject: [PATCH] regulator: uniphier: Fix probe error handling
Ensure unwind all resources if probe fails.
Signed-off-by: Axel Lin <axel.lin@ingics.com> Reviewed-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com> Signed-off-by: Mark Brown <broonie@kernel.org> --- drivers/regulator/uniphier-regulator.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/regulator/uniphier-regulator.c b/drivers/regulator/uniphier-regulator.c index abf22acbd13e..6ba0ae405f2b 100644 --- a/drivers/regulator/uniphier-regulator.c +++ b/drivers/regulator/uniphier-regulator.c @@ -87,8 +87,10 @@ static int uniphier_regulator_probe(struct platform_device *pdev) } regmap = devm_regmap_init_mmio(dev, base, priv->data->regconf); - if (IS_ERR(regmap)) - return PTR_ERR(regmap); + if (IS_ERR(regmap)) { + ret = PTR_ERR(regmap); + goto out_rst_assert; + } config.dev = dev; config.driver_data = priv; -- 2.20.1
| |