Commit ee54e7a1 authored by Johan Hovold's avatar Johan Hovold Committed by Greg Kroah-Hartman

mfd: twl4030-audio: Fix sibling-node lookup

commit 0a423772 upstream.

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")
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 381d368c
...@@ -159,13 +159,18 @@ unsigned int twl4030_audio_get_mclk(void) ...@@ -159,13 +159,18 @@ unsigned int twl4030_audio_get_mclk(void)
EXPORT_SYMBOL_GPL(twl4030_audio_get_mclk); EXPORT_SYMBOL_GPL(twl4030_audio_get_mclk);
static bool twl4030_audio_has_codec(struct twl4030_audio_data *pdata, 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) if (pdata && pdata->codec)
return true; 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 true;
}
return false; return false;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment