diff options
author | Alexander Shiyan <shc_work@mail.ru> | 2014-03-02 02:44:35 -0500 |
---|---|---|
committer | Mark Brown <broonie@linaro.org> | 2014-03-02 20:58:23 -0500 |
commit | b431e69a6f2eef526e07819bb8a78d5d2876ff62 (patch) | |
tree | 804e1af3e72a951743e422475a9a70ec3450de21 | |
parent | bf7f882b1ecef99eedfe36c214458fd457cf7d86 (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>
-rw-r--r-- | drivers/regulator/mc13xxx-regulator-core.c | 8 |
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) | |||
167 | struct device_node *parent; | 167 | struct device_node *parent; |
168 | int num; | 168 | int num; |
169 | 169 | ||
170 | if (!pdev->dev.of_node) | 170 | if (!pdev->dev.parent->of_node) |
171 | return -ENODEV; | 171 | return -ENODEV; |
172 | 172 | ||
173 | parent = of_get_child_by_name(pdev->dev.of_node, "regulators"); | 173 | parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators"); |
174 | if (!parent) | 174 | if (!parent) |
175 | return -ENODEV; | 175 | return -ENODEV; |
176 | 176 | ||
@@ -189,10 +189,10 @@ struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt( | |||
189 | struct device_node *parent, *child; | 189 | struct device_node *parent, *child; |
190 | int i, parsed = 0; | 190 | int i, parsed = 0; |
191 | 191 | ||
192 | if (!pdev->dev.of_node) | 192 | if (!pdev->dev.parent->of_node) |
193 | return NULL; | 193 | return NULL; |
194 | 194 | ||
195 | parent = of_get_child_by_name(pdev->dev.of_node, "regulators"); | 195 | parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators"); |
196 | if (!parent) | 196 | if (!parent) |
197 | return NULL; | 197 | return NULL; |
198 | 198 | ||