projects
/
profile
/
ivi
/
kernel-x86-ivi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'drm-fixes-3.14' of git://people.freedesktop.org/~agd5f/linux into drm...
[profile/ivi/kernel-x86-ivi.git]
/
drivers
/
regulator
/
s2mps11.c
diff --git
a/drivers/regulator/s2mps11.c
b/drivers/regulator/s2mps11.c
index
d9e5579
..
cd0b9e3
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;