Merge tag 'driver-core-3.19-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[cascardo/linux.git] / drivers / regulator / twl-regulator.c

diff --git a/drivers/regulator/twl-regulator.c b/drivers/regulator/twl-regulator.c
index 00c49e7..955a6fb 100644 (file)
--- a/drivers/regulator/twl-regulator.c
+++ b/drivers/regulator/twl-regulator.c
@@ -1104,7 +1104,8 @@ static int twlreg_probe(struct platform_device *pdev)
                template = match->data;
                id = template->desc.id;
                initdata = of_get_regulator_init_data(&pdev->dev,
-                                                     pdev->dev.of_node);
+                                                     pdev->dev.of_node,
+                                                     &template->desc);
                drvdata = NULL;
        } else {
                id = pdev->id;