diff options
| author | Mark Brown <broonie@kernel.org> | 2014-12-05 11:06:18 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-12-05 11:06:18 +0000 |
| commit | f291c74a32509d31731bb82cbb26c64cd430805b (patch) | |
| tree | c19a8a22880a48a4a4b6eb91ba1a30dd62427f5e /drivers/regulator/vexpress.c | |
| parent | 8b7daad3da2b36f5fe494f5d0c5ef25b33d56b96 (diff) | |
| parent | 5e5e3a42c653c5ef1c281651f1882411601129bd (diff) | |
Merge branch 'topic/suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-sky81452
Conflicts:
drivers/regulator/sky81452-regulator.c
Diffstat (limited to 'drivers/regulator/vexpress.c')
| -rw-r--r-- | drivers/regulator/vexpress.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/regulator/vexpress.c b/drivers/regulator/vexpress.c index 02e7267ccf92..5e7c789023a9 100644 --- a/drivers/regulator/vexpress.c +++ b/drivers/regulator/vexpress.c @@ -74,7 +74,8 @@ static int vexpress_regulator_probe(struct platform_device *pdev) reg->desc.owner = THIS_MODULE; reg->desc.continuous_voltage_range = true; - init_data = of_get_regulator_init_data(&pdev->dev, pdev->dev.of_node); + init_data = of_get_regulator_init_data(&pdev->dev, pdev->dev.of_node, + ®->desc); if (!init_data) return -EINVAL; |