projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge remote-tracking branch 'regulator/topic/core' into regulator-next
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
regulator
/
s2mps11.c
diff --git
a/drivers/regulator/s2mps11.c
b/drivers/regulator/s2mps11.c
index 7e110b91be51a07c80818198f831b4410f44f820..89966213315cd1e13708e7c0502bdd31d2044ceb 100644
(file)
--- a/
drivers/regulator/s2mps11.c
+++ b/
drivers/regulator/s2mps11.c
@@
-441,6
+441,7
@@
common_reg:
for (i = 0; i < S2MPS11_REGULATOR_MAX; i++) {
if (!reg_np) {
config.init_data = pdata->regulators[i].initdata;
+ config.of_node = pdata->regulators[i].reg_node;
} else {
config.init_data = rdata[i].init_data;
config.of_node = rdata[i].of_node;