]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commitdiff
ASoC: da7218: fix fix child-node lookup
authorJohan Hovold <johan@kernel.org>
Mon, 13 Nov 2017 11:12:55 +0000 (12:12 +0100)
committerMark Brown <broonie@kernel.org>
Thu, 16 Nov 2017 12:01:43 +0000 (12:01 +0000)
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>
sound/soc/codecs/da7218.c

index b2d42ec1dcd9f7f75e98c04dd35c06351bf3ca7b..56564ce90cb6b0cb156f08ae39cc46a828f32594 100644 (file)
@@ -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;