diff options
| author | Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-09-01 13:50:16 +0100 |
| commit | 6979380d85fd9e1ff701021206b315fcd66b510e (patch) | |
| tree | 8f230b8404cafdcfafba44bf97210c94ee963f92 /drivers/regulator/88pm800.c | |
| parent | 3aba952706c2f1e5f05987be0cda716ecf2b5d55 (diff) | |
| parent | d6c7e1139591b9ba7c4ad9c5eec748f0a68ad212 (diff) | |
Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next
Diffstat (limited to 'drivers/regulator/88pm800.c')
| -rw-r--r-- | drivers/regulator/88pm800.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800.c index b30f5ce659d1..3459f60dcfd1 100644 --- a/drivers/regulator/88pm800.c +++ b/drivers/regulator/88pm800.c @@ -283,7 +283,7 @@ static int pm800_regulator_dt_init(struct platform_device *pdev) static int pm800_regulator_probe(struct platform_device *pdev) { struct pm80x_chip *chip = dev_get_drvdata(pdev->dev.parent); - struct pm80x_platform_data *pdata = pdev->dev.parent->platform_data; + struct pm80x_platform_data *pdata = dev_get_platdata(pdev->dev.parent); struct pm800_regulators *pm800_data; struct pm800_regulator_info *info; struct regulator_config config = { }; |