diff options
| author | Johan Hovold <johan@kernel.org> | 2017-11-11 16:38:43 +0100 |
|---|---|---|
| committer | Lee Jones <lee.jones@linaro.org> | 2017-11-29 17:28:45 +0100 |
| commit | 0a423772de2f3d7b00899987884f62f63ae00dcb (patch) | |
| tree | 56975bf389ea47c703d80e3b00d6b64f1d379260 /drivers/mfd | |
| parent | mfd: cros ec: spi: Don't send first message too soon (diff) | |
| download | linux-0a423772de2f3d7b00899987884f62f63ae00dcb.tar.xz linux-0a423772de2f3d7b00899987884f62f63ae00dcb.zip | |
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: 019a7e6b7b31 ("mfd: twl4030-audio: Add DT support")
Cc: stable <stable@vger.kernel.org> # 3.7
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>
Diffstat (limited to 'drivers/mfd')
| -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 da16bf45fab4..dc94ffc6321a 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; } |