[PATCH 1/1] regulator: mc13xxx: Fix NULL pointer error in non-DT mode

[PATCH 1/1] regulator: mc13xxx: Fix NULL pointer error in non-DT mode

[Sachin Kamat]

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>
---
 drivers/regulator/mc13xxx-regulator-core.c |   12 ++++++++----
 1 file 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;
 
-- 
1.7.9.5

Re: [PATCH 1/1] regulator: mc13xxx: Fix NULL pointer error in non-DT mode

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 296 bytes --]

On Tue, Feb 25, 2014 at 04:49:27PM +0530, Sachin Kamat wrote:
> 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.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 836 bytes --]