mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-28 16:52:18 +00:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git
This commit is contained in:
commit
a804015764
@ -175,7 +175,7 @@ static int of_get_regulation_constraints(struct device *dev,
|
||||
if (!ret)
|
||||
constraints->enable_time = pval;
|
||||
|
||||
ret = of_property_read_u32(np, "regulator-uv-survival-time-ms", &pval);
|
||||
ret = of_property_read_u32(np, "regulator-uv-less-critical-window-ms", &pval);
|
||||
if (!ret)
|
||||
constraints->uv_less_critical_window_ms = pval;
|
||||
else
|
||||
|
Loading…
Reference in New Issue
Block a user