diff options
| author | Johan Hovold <johan@kernel.org> | 2017-11-11 16:38:43 +0100 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2018-03-03 15:51:39 +0000 |
| commit | 5d5c96e545d5cfb16a9fc65653962d2cf20ec25f (patch) | |
| tree | 0073b73af50984682873b668eace981ececb927f | |
| parent | 01cb37b9380bca03d92f80a638377925c14599eb (diff) | |
| download | linux-stable-5d5c96e545d5cfb16a9fc65653962d2cf20ec25f.tar.gz linux-stable-5d5c96e545d5cfb16a9fc65653962d2cf20ec25f.tar.bz2 linux-stable-5d5c96e545d5cfb16a9fc65653962d2cf20ec25f.zip | |
mfd: twl4030-audio: Fix sibling-node lookup
commit 0a423772de2f3d7b00899987884f62f63ae00dcb 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: 019a7e6b7b31 ("mfd: twl4030-audio: Add DT support")
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>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
| -rw-r--r-- | drivers/mfd/twl4030-audio.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/drivers/mfd/twl4030-audio.c b/drivers/mfd/twl4030-audio.c index 07fe542e6fc0..9372f5e6b677 100644 --- a/drivers/mfd/twl4030-audio.c +++ b/drivers/mfd/twl4030-audio.c @@ -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; } |