Skip to content

Commit b648264

Browse files
committed
Merge tag 'regulator-fix-v6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator
Pull regulator fix from Mark Brown: "The recently added regulator-uv-survival-time-ms property was renamed during the review of the series that added it, but unfortunately only in the DT binding and not in the code that parses the binding. This brings the code in line with the binding, if someone started using the original name we can add compat support for it but there's nothing upstream yet and it's a very niche feature so hopefully not" * tag 'regulator-fix-v6.13-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator: regulator: rename regulator-uv-survival-time-ms according to DT binding
2 parents af215c9 + 1322149 commit b648264

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

drivers/regulator/of_regulator.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ static int of_get_regulation_constraints(struct device *dev,
175175
if (!ret)
176176
constraints->enable_time = pval;
177177

178-
ret = of_property_read_u32(np, "regulator-uv-survival-time-ms", &pval);
178+
ret = of_property_read_u32(np, "regulator-uv-less-critical-window-ms", &pval);
179179
if (!ret)
180180
constraints->uv_less_critical_window_ms = pval;
181181
else

0 commit comments

Comments
 (0)