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 / 88pm8607.c

diff --git a/drivers/regulator/88pm8607.c b/drivers/regulator/88pm8607.c
index e04b333cc108fd450be2130abd6e4ec32d6dc72a..c3d15427adc7b2052191884aa58d3a069410016e 100644 (file)
--- a/drivers/regulator/88pm8607.c
+++ b/drivers/regulator/88pm8607.c
@@ -330,7 +330,8 @@ static int pm8607_regulator_dt_init(struct platform_device *pdev,
        for_each_child_of_node(nproot, np) {
                if (!of_node_cmp(np->name, info->desc.name)) {
                        config->init_data =
-                               of_get_regulator_init_data(&pdev->dev, np);
+                               of_get_regulator_init_data(&pdev->dev, np,
+                                                          &info->desc);
                        config->of_node = np;
                        break;
                }