diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:16 -0400 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 08:50:16 -0400 |
| commit | 6979380d85fd9e1ff701021206b315fcd66b510e (patch) | |
| tree | 8f230b8404cafdcfafba44bf97210c94ee963f92 /drivers/regulator/da903x.c | |
| parent | 3aba952706c2f1e5f05987be0cda716ecf2b5d55 (diff) | |
| parent | d6c7e1139591b9ba7c4ad9c5eec748f0a68ad212 (diff) | |
Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next
Diffstat (limited to 'drivers/regulator/da903x.c')
| -rw-r--r-- | drivers/regulator/da903x.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/da903x.c b/drivers/regulator/da903x.c index 1378a242a3af..f06854cf8cf5 100644 --- a/drivers/regulator/da903x.c +++ b/drivers/regulator/da903x.c | |||
| @@ -460,7 +460,7 @@ static int da903x_regulator_probe(struct platform_device *pdev) | |||
| 460 | ri->desc.ops = &da9030_regulator_ldo1_15_ops; | 460 | ri->desc.ops = &da9030_regulator_ldo1_15_ops; |
| 461 | 461 | ||
| 462 | config.dev = &pdev->dev; | 462 | config.dev = &pdev->dev; |
| 463 | config.init_data = pdev->dev.platform_data; | 463 | config.init_data = dev_get_platdata(&pdev->dev); |
| 464 | config.driver_data = ri; | 464 | config.driver_data = ri; |
| 465 | 465 | ||
| 466 | rdev = regulator_register(&ri->desc, &config); | 466 | rdev = regulator_register(&ri->desc, &config); |