Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/uml

[~andy/linux] / drivers / regulator / 88pm800.c

diff --git a/drivers/regulator/88pm800.c b/drivers/regulator/88pm800.c
index b30f5ce659d1bab878b79cdb0e1a8f9bb222fc3e..3459f60dcfd1c7dfc67aa641edd49f697ffb8b94 100644 (file)
--- 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 = { };