diff options
| author | Sachin Kamat <sachin.kamat@linaro.org> | 2014-02-25 16:49:27 +0530 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-02-25 21:27:59 +0900 |
| commit | bf7f882b1ecef99eedfe36c214458fd457cf7d86 (patch) | |
| tree | 3d583b464db48ed78c480a924e12789e9423758a /drivers/regulator/mc13xxx-regulator-core.c | |
| parent | fc5a6e5b0cf107517910b139e3d3af803fa09952 (diff) | |
| download | blackbird-obmc-linux-bf7f882b1ecef99eedfe36c214458fd457cf7d86.tar.gz blackbird-obmc-linux-bf7f882b1ecef99eedfe36c214458fd457cf7d86.zip | |
regulator: mc13xxx: Fix NULL pointer error in non-DT mode
Add a check to avoid NULL pointer dereference error when
booted in non-DT mode. While at it also remove the additional
of_node_get which is no longer needed for of_get_child_by_name
and fix the node pointer.
Signed-off-by: Sachin Kamat <sachin.kamat@linaro.org>
Reported-by: Philippe Rétornaz <philippe.retornaz@epfl.ch>
Signed-off-by: Mark Brown <broonie@linaro.org>
Diffstat (limited to 'drivers/regulator/mc13xxx-regulator-core.c')
| -rw-r--r-- | drivers/regulator/mc13xxx-regulator-core.c | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c index 4498a3f0733d..bf75fcabfa3c 100644 --- 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_get_child_by_name(pdev->dev.parent->of_node, "regulators"); + if (!pdev->dev.of_node) + return -ENODEV; + + parent = of_get_child_by_name(pdev->dev.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_get_child_by_name(pdev->dev.parent->of_node, "regulators"); + if (!pdev->dev.of_node) + return NULL; + + parent = of_get_child_by_name(pdev->dev.of_node, "regulators"); if (!parent) return NULL; |
