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 tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
regulator
/
max8997.c
diff --git
a/drivers/regulator/max8997.c
b/drivers/regulator/max8997.c
index 0767ae4f1280cf8baa537edb37281aac160bce98..ea0196d4496b949d59e51ab2df96ad6b74bbd057 100644
(file)
--- a/
drivers/regulator/max8997.c
+++ b/
drivers/regulator/max8997.c
@@
-953,7
+953,8
@@
static int max8997_pmic_dt_parse_pdata(struct platform_device *pdev,
rdata->id = i;
rdata->initdata = of_get_regulator_init_data(&pdev->dev,
- reg_np);
+ reg_np,
+ ®ulators[i]);
rdata->reg_node = reg_np;
rdata++;
}