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

Commit a7de0e97 authored by Julian Scheel's avatar Julian Scheel Committed by Greg Kroah-Hartman
Browse files

ASoC: simple-card: Fix misleading error message 



commit 7ac45d1635a4cd2e99a4b11903d4a2815ca1b27b upstream.

In case cpu could not be found the error message would always refer to
/codec/ not being found in DT. Fix this by catching the cpu node not found
case explicitly.

Signed-off-by: default avatarJulian Scheel <julian@jusst.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarthongsyho <thong.ho.px@rvc.renesas.com>
Signed-off-by: default avatarNhan Nguyen <nhan.nguyen.yb@renesas.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 7c17a1e5

sound/soc/generic/simple-card.c

+7 −1
Original line number Diff line number Diff line
@@ -232,13 +232,19 @@ static int asoc_simple_card_dai_link_of(struct device_node *node, 
	snprintf(prop, sizeof(prop), "%scpu", prefix);

	cpu = of_get_child_by_name(node, prop);



	if (!cpu) {

		ret = -EINVAL;

		dev_err(dev, "%s: Can't find %s DT node\n", __func__, prop);

		goto dai_link_of_err;

	}



	snprintf(prop, sizeof(prop), "%splat", prefix);

	plat = of_get_child_by_name(node, prop);



	snprintf(prop, sizeof(prop), "%scodec", prefix);

	codec = of_get_child_by_name(node, prop);



	if (!cpu || !codec) {

	if (!codec) {

		ret = -EINVAL;

		dev_err(dev, "%s: Can't find %s DT node\n", __func__, prop);

		goto dai_link_of_err;