diff options
| author | Johan Hovold <johan@kernel.org> | 2017-11-13 12:12:55 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2017-11-16 13:01:43 +0100 |
| commit | bc6476d6c1edcb9b97621b5131bd169aa81f27db (patch) | |
| tree | 7db89f2073d6e38264ab909f9a5866f5bc1c5e74 | |
| parent | Merge remote-tracking branches 'asoc/topic/tfa9879', 'asoc/topic/ts3a277e', '... (diff) | |
| download | linux-bc6476d6c1edcb9b97621b5131bd169aa81f27db.tar.xz linux-bc6476d6c1edcb9b97621b5131bd169aa81f27db.zip | |
ASoC: da7218: fix 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.
Fixes: 4d50934abd22 ("ASoC: da7218: Add da7218 codec driver")
Signed-off-by: Johan Hovold <johan@kernel.org>
Acked-by: Adam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Cc: stable <stable@vger.kernel.org>
| -rw-r--r-- | sound/soc/codecs/da7218.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/codecs/da7218.c b/sound/soc/codecs/da7218.c index b2d42ec1dcd9..56564ce90cb6 100644 --- a/sound/soc/codecs/da7218.c +++ b/sound/soc/codecs/da7218.c @@ -2520,7 +2520,7 @@ static struct da7218_pdata *da7218_of_to_pdata(struct snd_soc_codec *codec) } if (da7218->dev_id == DA7218_DEV_ID) { - hpldet_np = of_find_node_by_name(np, "da7218_hpldet"); + hpldet_np = of_get_child_by_name(np, "da7218_hpldet"); if (!hpldet_np) return pdata; |