regulator: mc13xxx: Fix probing with DT

The nodes of regulators should be retrieved from parent device.
Bug was be introduced by commit (regulator: mc13xxx: Fix NULL
pointer error in non-DT mode) in conjuction with (mfd: Revert
"mfd: Always assign of_node in mfd_add_device()").

Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
Signed-off-by: Mark Brown <broonie@linaro.org>

diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index bf75fcabfa3c06fc9f265c3439d4aff5628f6dfb..05b971726ffaa0700e9147c912c35a83ebef9fc6 100644 (file)
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -167,10 +167,10 @@ int mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
        struct device_node *parent;
        int num;
 
-       if (!pdev->dev.of_node)
+       if (!pdev->dev.parent->of_node)
                return -ENODEV;
 
-       parent = of_get_child_by_name(pdev->dev.of_node, "regulators");
+       parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators");
        if (!parent)
                return -ENODEV;
 
@@ -189,10 +189,10 @@ struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(
        struct device_node *parent, *child;
        int i, parsed = 0;
 
-       if (!pdev->dev.of_node)
+       if (!pdev->dev.parent->of_node)
                return NULL;
 
-       parent = of_get_child_by_name(pdev->dev.of_node, "regulators");
+       parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators");
        if (!parent)
                return NULL;