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

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

Documentation/devicetree/bindings/regulator/nxp,pca9450-regulator.yaml

+0 −11
Original line number Diff line number Diff line
@@ -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

drivers/regulator/core.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}