Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bf7f882b authored Feb 25, 2014 by Sachin Kamat Committed by Mark Brown Feb 25, 2014

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>

parent fc5a6e5b

drivers/regulator/mc13xxx-regulator-core.c

+8 −4

Original line number	Original line	Diff line number	Diff line
	@@ -167,8 +167,10 @@ int mc13xxx_get_num_regulators_dt(struct platform_device *pdev)
	struct device_node *parent;		struct device_node *parent;
	int num;		int num;

	of_node_get(pdev->dev.parent->of_node);		if (!pdev->dev.of_node)
	parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators");		return -ENODEV;

			parent = of_get_child_by_name(pdev->dev.of_node, "regulators");
	if (!parent)		if (!parent)
	return -ENODEV;		return -ENODEV;

	@@ -187,8 +189,10 @@ struct mc13xxx_regulator_init_data *mc13xxx_parse_regulators_dt(
	struct device_node parent, child;		struct device_node parent, child;
	int i, parsed = 0;		int i, parsed = 0;

	of_node_get(pdev->dev.parent->of_node);		if (!pdev->dev.of_node)
	parent = of_get_child_by_name(pdev->dev.parent->of_node, "regulators");		return NULL;

			parent = of_get_child_by_name(pdev->dev.of_node, "regulators");
	if (!parent)		if (!parent)
	return NULL;		return NULL;