[PATCH 1/1] regulator: mc13xxx: check if DT is enabled

[Philippe RÃtornaz]

This fix a regression on non-DT board booted with a DT enabled kernel

Signed-off-by: Philippe RÃtornaz <philippe.retornaz@xxxxxxx>
---
 drivers/regulator/mc13xxx-regulator-core.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/regulator/mc13xxx-regulator-core.c b/drivers/regulator/mc13xxx-regulator-core.c
index 4498a3f..a10c999 100644
--- a/drivers/regulator/mc13xxx-regulator-core.c
+++ b/drivers/regulator/mc13xxx-regulator-core.c
@@ -167,6 +167,9 @@ int mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
 	struct device_node *parent;
 	int num;
 
+	if(!pdev->dev.parent->of_node)
+		return -ENODEV;
+
 	of_node_get(pdev->dev.parent->of_node);
 	parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators");
 	if (!parent)
@@ -187,6 +190,9 @@ struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(
 	struct device_node *parent, *child;
 	int i, parsed = 0;
 
+	if(!pdev->dev.parent->of_node)
+		return NULL;
+
 	of_node_get(pdev->dev.parent->of_node);
 	parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators");
 	if (!parent)
-- 
1.7.9.5

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/