diff options
| author | Mark Brown <broonie@kernel.org> | 2022-08-15 01:33:57 +0200 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2022-08-15 01:33:57 +0200 |
| commit | ac5d2f049c4b9b466f9757415007f65db949fe24 (patch) | |
| tree | 0822aac324947cd1688c5c0a7a4b8850ca95585f | |
| parent | Linux 6.0-rc1 (diff) | |
| parent | regulator: core: Fix missing error return from regulator_bulk_get() (diff) | |
| download | linux-ac5d2f049c4b9b466f9757415007f65db949fe24.tar.xz linux-ac5d2f049c4b9b466f9757415007f65db949fe24.zip | |
Merge remote-tracking branch 'regulator/for-5.20' into regulator-6.0
| -rw-r--r-- | Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml | 11 | ||||
| -rw-r--r-- | drivers/regulator/core.c | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml b/Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml index b539781e39aa..835b53302db8 100644 --- a/Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml +++ b/Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml @@ -47,12 +47,6 @@ properties: description: Properties for single LDO regulator. - properties: - regulator-name: - pattern: "^LDO[1-5]$" - description: - should be "LDO1", ..., "LDO5" - unevaluatedProperties: false "^BUCK[1-6]$": @@ -62,11 +56,6 @@ properties: Properties for single BUCK regulator. properties: - regulator-name: - pattern: "^BUCK[1-6]$" - description: - should be "BUCK1", ..., "BUCK6" - nxp,dvs-run-voltage: $ref: "/schemas/types.yaml#/definitions/uint32" minimum: 600000 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; } |