diff options
| author | Mark Brown <broonie@kernel.org> | 2014-11-26 22:42:41 +0300 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2014-11-26 22:42:41 +0300 |
| commit | f9fbc21d03d719a10cbffe19870092592bf60d56 (patch) | |
| tree | 3f0ed48bd94d1957bd03fbebdc9779270840adc8 /drivers/regulator/max8998.c | |
| parent | a26ed45c912d46cedac5f15c2872aa7e462fcdf1 (diff) | |
| parent | 5e5e3a42c653c5ef1c281651f1882411601129bd (diff) | |
| download | linux-f9fbc21d03d719a10cbffe19870092592bf60d56.tar.xz | |
Merge branch 'topic/suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator into regulator-max77802
Diffstat (limited to 'drivers/regulator/max8998.c')
| -rw-r--r-- | drivers/regulator/max8998.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/regulator/max8998.c b/drivers/regulator/max8998.c index 961091b46557..59e34a05a4a2 100644 --- a/drivers/regulator/max8998.c +++ b/drivers/regulator/max8998.c @@ -686,8 +686,9 @@ static int max8998_pmic_dt_parse_pdata(struct max8998_dev *iodev, continue; rdata->id = regulators[i].id; - rdata->initdata = of_get_regulator_init_data( - iodev->dev, reg_np); + rdata->initdata = of_get_regulator_init_data(iodev->dev, + reg_np, + ®ulators[i]); rdata->reg_node = reg_np; ++rdata; } |