summaryrefslogtreecommitdiffstats
path: root/drivers/regulator/da903x.c
diff options
context:
space:
mode:
authorMark Brown <broonie@linaro.org>2013-09-01 13:50:16 +0100
committerMark Brown <broonie@linaro.org>2013-09-01 13:50:16 +0100
commit6979380d85fd9e1ff701021206b315fcd66b510e (patch)
tree8f230b8404cafdcfafba44bf97210c94ee963f92 /drivers/regulator/da903x.c
parent3aba952706c2f1e5f05987be0cda716ecf2b5d55 (diff)
parentd6c7e1139591b9ba7c4ad9c5eec748f0a68ad212 (diff)
downloadlinux-6979380d85fd9e1ff701021206b315fcd66b510e.tar.gz
linux-6979380d85fd9e1ff701021206b315fcd66b510e.tar.bz2
linux-6979380d85fd9e1ff701021206b315fcd66b510e.zip
Merge remote-tracking branch 'regulator/topic/max8660' into regulator-next
Diffstat (limited to 'drivers/regulator/da903x.c')
-rw-r--r--drivers/regulator/da903x.c2
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)
ri->desc.ops = &da9030_regulator_ldo1_15_ops;
config.dev = &pdev->dev;
- config.init_data = pdev->dev.platform_data;
+ config.init_data = dev_get_platdata(&pdev->dev);
config.driver_data = ri;
rdev = regulator_register(&ri->desc, &config);