[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <1393318071-13524-1-git-send-email-philippe.retornaz@epfl.ch>
Date: Tue, 25 Feb 2014 09:47:51 +0100
From: Philippe Rétornaz <philippe.retornaz@...l.ch>
To: sachin.kamat@...aro.org, broonie@...nel.org
Cc: linux-kernel@...r.kernel.org, lgirdwood@...il.com,
Philippe Rétornaz <philippe.retornaz@...l.ch>
Subject: [PATCH 1/1] regulator: mc13xxx: check if DT is enabled
This fix a regression on non-DT board booted with a DT enabled kernel
Signed-off-by: Philippe Rétornaz <philippe.retornaz@...l.ch>
---
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@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists