Commit 85e9b13c authored Nov 11, 2017 by Johan Hovold Committed by Lee Jones Nov 29, 2017

mfd: twl6040: Fix child-node lookup



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.

Cc: stable <stable@vger.kernel.org>     # 3.5
Fixes: 37e13cec ("mfd: Add support for Device Tree to twl6040")
Fixes: ca2cad6a ("mfd: Fix twl6040 build failure")
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com>
Signed-off-by: Lee Jones <lee.jones@linaro.org>

parent 0a423772

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;
		}

Admin message