diff options
| author | Mark Brown <broonie@kernel.org> | 2022-08-15 00:33:57 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-08-15 00:33:57 +0100 |
| commit | ac5d2f049c4b9b466f9757415007f65db949fe24 (patch) | |
| tree | 0822aac324947cd1688c5c0a7a4b8850ca95585f /drivers/regulator | |
| parent | 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff) | |
| parent | d511e8a7e850db567cd7f633288aa96a19508e5b (diff) | |
| download | linux-ac5d2f049c4b9b466f9757415007f65db949fe24.tar.gz linux-ac5d2f049c4b9b466f9757415007f65db949fe24.tar.bz2 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.c | 2 |
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; } |