Commit 908a4a6f authored by Eugen Hristev's avatar Eugen Hristev Committed by Zheng Zengkai
Browse files

ASoC: mediatek: mt8186_mt6366_rt1019_rt5682s: trivial: fix error messages 

stable inclusion
from stable-v6.6.2
commit 74b6a2f23ed0fbe6372d65b0f82de9deb3ff9540
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8IW7G

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=74b6a2f23ed0fbe6372d65b0f82de9deb3ff9540



--------------------------------

[ Upstream commit 004fc58edea6f00db9ad07b40b882e8d976f7a54 ]

Property 'playback-codecs' is referenced as 'speaker-codec' in the error
message, and this can lead to confusion.
Correct the error message such that the correct property name is
referenced.

Fixes: 0da16e37 ("ASoC: mediatek: mt8186: add machine driver with mt6366, rt1019 and rt5682s")
Signed-off-by: default avatarEugen Hristev <eugen.hristev@collabora.com>
Reviewed-by: default avatarAngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>
Link: https://lore.kernel.org/r/20231031103139.77395-1-eugen.hristev@collabora.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarZheng Zengkai <zhengzengkai@huawei.com>
parent 9d5e3ecd

sound/soc/mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c

+2 −2
Original line number Diff line number Diff line
@@ -1179,7 +1179,7 @@ static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev) 
	playback_codec = of_get_child_by_name(pdev->dev.of_node, "playback-codecs");

	if (!playback_codec) {

		ret = -EINVAL;

		dev_err_probe(&pdev->dev, ret, "Property 'speaker-codecs' missing or invalid\n");

		dev_err_probe(&pdev->dev, ret, "Property 'playback-codecs' missing or invalid\n");

		goto err_playback_codec;

	}
@@ -1193,7 +1193,7 @@ static int mt8186_mt6366_rt1019_rt5682s_dev_probe(struct platform_device *pdev) 
	for_each_card_prelinks(card, i, dai_link) {

		ret = mt8186_mt6366_card_set_be_link(card, dai_link, playback_codec, "I2S3");

		if (ret) {

			dev_err_probe(&pdev->dev, ret, "%s set speaker_codec fail\n",

			dev_err_probe(&pdev->dev, ret, "%s set playback_codec fail\n",

				      dai_link->name);

			goto err_probe;

		}