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

Commit 637de99c authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman
Browse files

mfd: twl6040: Fix child-node lookup 



commit 85e9b13cbb130a3209f21bd7933933399c389ffe upstream.

Fix child-node lookup during probe, which ended up searching the whole
device tree depth-first starting at the parent rather than just matching
on its children.

To make things worse, the parent node was prematurely freed, while the
child node was leaked.

Note that the CONFIG_OF compile guard can be removed as
of_get_child_by_name() provides a !CONFIG_OF implementation which always
fails.

Fixes: 37e13cec ("mfd: Add support for Device Tree to twl6040")
Fixes: ca2cad6a ("mfd: Fix twl6040 build failure")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarPeter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: default avatarLee Jones <lee.jones@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 6300daa0

drivers/mfd/twl6040.c

+8 −4
Original line number Diff line number Diff line
@@ -97,12 +97,16 @@ static struct reg_sequence twl6040_patch[] = { 
};





static bool twl6040_has_vibra(struct device_node *node)

static bool twl6040_has_vibra(struct device_node *parent)

{

#ifdef CONFIG_OF

	if (of_find_node_by_name(node, "vibra"))

	struct device_node *node;



	node = of_get_child_by_name(parent, "vibra");

	if (node) {

		of_node_put(node);

		return true;

#endif

	}



	return false;

}