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

[linux-2.6-microblaze.git] / drivers / regulator / pwm-regulator.c

diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
index 914b88b..253833a 100644 (file)
--- a/drivers/regulator/pwm-regulator.c
+++ b/drivers/regulator/pwm-regulator.c
@@ -149,7 +149,8 @@ static int pwm_regulator_probe(struct platform_device *pdev)
                return ret;
        }
 
-       config.init_data = of_get_regulator_init_data(&pdev->dev, np);
+       config.init_data = of_get_regulator_init_data(&pdev->dev, np,
+                                                     &drvdata->desc);
        if (!config.init_data)
                return -ENOMEM;