summaryrefslogtreecommitdiffstats
path: root/drivers/regulator
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2022-08-15 01:33:57 +0200
committerMark Brown <broonie@kernel.org>2022-08-15 01:33:57 +0200
commitac5d2f049c4b9b466f9757415007f65db949fe24 (patch)
tree0822aac324947cd1688c5c0a7a4b8850ca95585f /drivers/regulator
parentLinux 6.0-rc1 (diff)
parentregulator: core: Fix missing error return from regulator_bulk_get() (diff)
downloadlinux-ac5d2f049c4b9b466f9757415007f65db949fe24.tar.xz
linux-ac5d2f049c4b9b466f9757415007f65db949fe24.zip
Merge remote-tracking branch 'regulator/for-5.20' into regulator-6.0
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/core.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
index 7150b1d0159e..d8373cb04f90 100644
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -4784,10 +4784,10 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
consumers[i].consumer = regulator_get(dev,
consumers[i].supply);
if (IS_ERR(consumers[i].consumer)) {
- consumers[i].consumer = NULL;
ret = dev_err_probe(dev, PTR_ERR(consumers[i].consumer),
"Failed to get supply '%s'",
consumers[i].supply);
+ consumers[i].consumer = NULL;
goto err;
}