Commit 15df6486 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'regulator-fix-v6.0-rc1' of...

Merge tag 'regulator-fix-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator

Pull regulator fixes from Mark Brown:
 "A couple of small fixes that came in since my pull request, nothing
  major here"

* tag 'regulator-fix-v6.0-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator:
  regulator: core: Fix missing error return from regulator_bulk_get()
  regulator: pca9450: Remove restrictions for regulator-name
parents c4e34dd9 d511e8a7
...@@ -47,12 +47,6 @@ properties: ...@@ -47,12 +47,6 @@ properties:
description: description:
Properties for single LDO regulator. Properties for single LDO regulator.
properties:
regulator-name:
pattern: "^LDO[1-5]$"
description:
should be "LDO1", ..., "LDO5"
unevaluatedProperties: false unevaluatedProperties: false
"^BUCK[1-6]$": "^BUCK[1-6]$":
...@@ -62,11 +56,6 @@ properties: ...@@ -62,11 +56,6 @@ properties:
Properties for single BUCK regulator. Properties for single BUCK regulator.
properties: properties:
regulator-name:
pattern: "^BUCK[1-6]$"
description:
should be "BUCK1", ..., "BUCK6"
nxp,dvs-run-voltage: nxp,dvs-run-voltage:
$ref: "/schemas/types.yaml#/definitions/uint32" $ref: "/schemas/types.yaml#/definitions/uint32"
minimum: 600000 minimum: 600000
......
...@@ -4784,10 +4784,10 @@ int regulator_bulk_get(struct device *dev, int num_consumers, ...@@ -4784,10 +4784,10 @@ int regulator_bulk_get(struct device *dev, int num_consumers,
consumers[i].consumer = regulator_get(dev, consumers[i].consumer = regulator_get(dev,
consumers[i].supply); consumers[i].supply);
if (IS_ERR(consumers[i].consumer)) { if (IS_ERR(consumers[i].consumer)) {
consumers[i].consumer = NULL;
ret = dev_err_probe(dev, PTR_ERR(consumers[i].consumer), ret = dev_err_probe(dev, PTR_ERR(consumers[i].consumer),
"Failed to get supply '%s'", "Failed to get supply '%s'",
consumers[i].supply); consumers[i].supply);
consumers[i].consumer = NULL;
goto err; goto err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment