Merge tag 'boards-3.15' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[mirror_ubuntu-zesty-kernel.git] / drivers / regulator / mc13xxx-regulator-core.c

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