diff options
| author | Johan Hovold <johan@kernel.org> | 2017-11-13 12:12:56 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-11-16 12:02:15 +0000 |
| commit | 15f8c5f2415bfac73f33a14bcd83422bcbfb5298 (patch) | |
| tree | 05bd07a4ba5dfefc7001b00b0d7974ce565a3022 /sound/soc | |
| parent | df6a3e245541ac61cc99f2887437e0a43dd08f2e (diff) | |
| download | linux-15f8c5f2415bfac73f33a14bcd83422bcbfb5298.tar.gz linux-15f8c5f2415bfac73f33a14bcd83422bcbfb5298.tar.bz2 linux-15f8c5f2415bfac73f33a14bcd83422bcbfb5298.zip | |
ASoC: twl4030: 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 codec node was also prematurely freed,
while the child node was leaked.
Fixes: 2d6d649a2e0f ("ASoC: twl4030: Support for DT booted kernel")
Signed-off-by: Johan Hovold <johan@kernel.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable <stable@vger.kernel.org>
Diffstat (limited to 'sound/soc')
| -rw-r--r-- | sound/soc/codecs/twl4030.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/soc/codecs/twl4030.c b/sound/soc/codecs/twl4030.c index c482b2e7a7d2..cfe72b9d4356 100644 --- a/sound/soc/codecs/twl4030.c +++ b/sound/soc/codecs/twl4030.c @@ -232,7 +232,7 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec) struct twl4030_codec_data *pdata = dev_get_platdata(codec->dev); struct device_node *twl4030_codec_node = NULL; - twl4030_codec_node = of_find_node_by_name(codec->dev->parent->of_node, + twl4030_codec_node = of_get_child_by_name(codec->dev->parent->of_node, "codec"); if (!pdata && twl4030_codec_node) { @@ -241,9 +241,11 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec) GFP_KERNEL); if (!pdata) { dev_err(codec->dev, "Can not allocate memory\n"); + of_node_put(twl4030_codec_node); return NULL; } twl4030_setup_pdata_of(pdata, twl4030_codec_node); + of_node_put(twl4030_codec_node); } return pdata; |