summaryrefslogtreecommitdiff
path: root/drivers/regulator
diff options
context:
space:
mode:
authorAlexander Shiyan <shc_work@mail.ru>2014-03-02 11:44:35 +0400
committerMark Brown <broonie@linaro.org>2014-03-03 10:58:23 +0900
commitb431e69a6f2eef526e07819bb8a78d5d2876ff62 (patch)
tree804e1af3e72a951743e422475a9a70ec3450de21 /drivers/regulator
parentbf7f882b1ecef99eedfe36c214458fd457cf7d86 (diff)
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>
Diffstat (limited to 'drivers/regulator')
-rw-r--r--drivers/regulator/mc13xxx-regulator-core.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index bf75fcabfa3c..05b971726ffa 100644
--- 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;