diff options
author | Mark Brown <broonie@linaro.org> | 2013-09-01 12:50:16 (GMT) |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2013-09-01 12:50:16 (GMT) |
commit | 6979380d85fd9e1ff701021206b315fcd66b510e (patch) | |
tree | 8f230b8404cafdcfafba44bf97210c94ee963f92 /drivers/regulator/wm8994-regulator.c | |
parent | 3aba952706c2f1e5f05987be0cda716ecf2b5d55 (diff) | |
parent | d6c7e1139591b9ba7c4ad9c5eec748f0a68ad212 (diff) | |
download | linux-6979380d85fd9e1ff701021206b315fcd66b510e.tar.xz |
Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next
Diffstat (limited to 'drivers/regulator/wm8994-regulator.c')
-rw-r--r-- | drivers/regulator/wm8994-regulator.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/regulator/wm8994-regulator.c b/drivers/regulator/wm8994-regulator.c index 8f2a8a7..5ee2a20 100644 --- a/drivers/regulator/wm8994-regulator.c +++ b/drivers/regulator/wm8994-regulator.c @@ -125,7 +125,7 @@ static const struct regulator_init_data wm8994_ldo_default[] = { static int wm8994_ldo_probe(struct platform_device *pdev) { struct wm8994 *wm8994 = dev_get_drvdata(pdev->dev.parent); - struct wm8994_pdata *pdata = wm8994->dev->platform_data; + struct wm8994_pdata *pdata = dev_get_platdata(wm8994->dev); int id = pdev->id % ARRAY_SIZE(pdata->ldo); struct regulator_config config = { }; struct wm8994_ldo *ldo; |