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

Commit 0a423772 authored by Johan Hovold's avatar Johan Hovold Committed by Lee Jones
Browse files

mfd: twl4030-audio: Fix sibling-node lookup 



A helper purported to look up a child node based on its name was using
the wrong of-helper and ended up prematurely freeing the parent of-node
while leaking any matching node.

To make things worse, any matching node would not even necessarily be a
child node as the whole device tree was searched depth-first starting at
the parent.

Fixes: 019a7e6b ("mfd: twl4030-audio: Add DT support")
Cc: stable <stable@vger.kernel.org>     # 3.7
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>
parent 15d83748

drivers/mfd/twl4030-audio.c

+7 −2
Original line number Diff line number Diff line
@@ -159,13 +159,18 @@ unsigned int twl4030_audio_get_mclk(void) 
EXPORT_SYMBOL_GPL(twl4030_audio_get_mclk);



static bool twl4030_audio_has_codec(struct twl4030_audio_data *pdata,

			      struct device_node *node)

			      struct device_node *parent)

{

	struct device_node *node;



	if (pdata && pdata->codec)

		return true;



	if (of_find_node_by_name(node, "codec"))

	node = of_get_child_by_name(parent, "codec");

	if (node) {

		of_node_put(node);

		return true;

	}



	return false;

}