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

[platform/adaptation/renesas_rcar/renesas_kernel.git] / drivers / regulator / pcap-regulator.c

diff --git a/drivers/regulator/pcap-regulator.c b/drivers/regulator/pcap-regulator.c
index 1a73a29..b49eaee 100644 (file)
--- a/drivers/regulator/pcap-regulator.c
+++ b/drivers/regulator/pcap-regulator.c
@@ -243,7 +243,7 @@ static int pcap_regulator_probe(struct platform_device *pdev)
        struct regulator_config config = { };
 
        config.dev = &pdev->dev;
-       config.init_data = pdev->dev.platform_data;
+       config.init_data = dev_get_platdata(&pdev->dev);
        config.driver_data = pcap;
 
        rdev = regulator_register(&pcap_regulators[pdev->id], &config);