未验证 提交 15f8c5f2 编写于 作者: J Johan Hovold 提交者: Mark Brown

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: 2d6d649a ("ASoC: twl4030: Support for DT booted kernel")
Signed-off-by: NJohan Hovold <johan@kernel.org>
Signed-off-by: NMark Brown <broonie@kernel.org>
Cc: stable <stable@vger.kernel.org>
上级 df6a3e24
...@@ -232,7 +232,7 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec) ...@@ -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 twl4030_codec_data *pdata = dev_get_platdata(codec->dev);
struct device_node *twl4030_codec_node = NULL; 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"); "codec");
if (!pdata && twl4030_codec_node) { if (!pdata && twl4030_codec_node) {
...@@ -241,9 +241,11 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec) ...@@ -241,9 +241,11 @@ static struct twl4030_codec_data *twl4030_get_pdata(struct snd_soc_codec *codec)
GFP_KERNEL); GFP_KERNEL);
if (!pdata) { if (!pdata) {
dev_err(codec->dev, "Can not allocate memory\n"); dev_err(codec->dev, "Can not allocate memory\n");
of_node_put(twl4030_codec_node);
return NULL; return NULL;
} }
twl4030_setup_pdata_of(pdata, twl4030_codec_node); twl4030_setup_pdata_of(pdata, twl4030_codec_node);
of_node_put(twl4030_codec_node);
} }
return pdata; return pdata;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册