Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit bc6476d6 authored by Johan Hovold's avatar Johan Hovold Committed by Mark Brown
Browse files

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: 4d50934a ("ASoC: da7218: Add da7218 codec driver")
Signed-off-by: default avatarJohan Hovold <johan@kernel.org>
Acked-by: default avatarAdam Thomson <Adam.Thomson.Opensource@diasemi.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Cc: stable <stable@vger.kernel.org>
parent df6a3e24
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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;