From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 26 Apr 2021 23:24:42 +0000 (-0700)
Subject: Merge tag 'regulator-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie... 
X-Git-Tag: v5.15.73~12124
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ca62e9090d229926f43f20291bb44d67897baab7;p=platform%2Fkernel%2Flinux-rpi.git

Merge tag 'regulator-v5.13' of git://git./linux/kernel/git/broonie/regulator

Pull regulator updates from Mark Brown:
 "Not much going on with regulator this cycle, even in terms of cleanups
  and fixes things were fairly quiet.

   - New helper for setting ramp delay

   - Conversion of the Qualcomm RPMH bindings to YAML

   - Support for Tang Cheng TCS4525"

* tag 'regulator-v5.13' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: (26 commits)
  regulator: Add binding for TCS4525
  regulator: fan53555: Add TCS4525 DCDC support
  dt-bindings: vendor-prefixes: Add Tang Cheng (TCS)
  regulator: core: Fix off_on_delay handling
  regulator: core: Respect off_on_delay at startup
  regulator: core.c: Improve a comment
  regulator: Avoid a double 'of_node_get' in 'regulator_of_get_init_node()'
  regulator: core.c: Fix indentation of comment
  regulator: s2mps11: Drop initialization via platform data
  regulator: s2mpa01: Drop initialization via platform data
  regulator: da9121: automotive variants identity fix
  regulator: Add regmap helper for ramp-delay setting
  regulator: helpers: Export helper voltage listing
  regulator: Add compatibles for PM7325/PMR735A
  regulator: Convert RPMh regulator bindings to YAML
  regulator: qcom-rpmh: Add PM7325/PMR735A regulator support
  regulator: qcom-rpmh: Add pmic5_ftsmps520 buck
  regulator: mt6360: remove redundant error print
  regulator: bd9576: Fix return from bd957x_probe()
  regulator: add missing call to of_node_put()
  ...
---

ca62e9090d229926f43f20291bb44d67897baab7
diff --cc drivers/regulator/scmi-regulator.c
index a38343f8c843,a917c81e99fa..bbadf72b94e8
--- a/drivers/regulator/scmi-regulator.c
+++ b/drivers/regulator/scmi-regulator.c
@@@ -345,10 -341,12 +345,12 @@@ static int scmi_regulator_probe(struct 
  	 */
  	np = of_find_node_by_name(handle->dev->of_node, "regulators");
  	for_each_child_of_node(np, child) {
 -		ret = process_scmi_regulator_of_node(sdev, child, rinfo);
 +		ret = process_scmi_regulator_of_node(sdev, ph, child, rinfo);
  		/* abort on any mem issue */
- 		if (ret == -ENOMEM)
+ 		if (ret == -ENOMEM) {
+ 			of_node_put(child);
  			return ret;
+ 		}
  	}
  
  	/*