From: Zhen Lei <thunder.leizhen@huawei.com>
Date: Thu, 17 Jun 2021 10:37:29 +0000 (+0800)
Subject: ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing()
X-Git-Tag: v4.4.276~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cf6596c5fb8af4d77b28bb35c54c69249a02fca8;p=thirdparty%2Fkernel%2Fstable.git

ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing()

[ Upstream commit 7d3865a10b9ff2669c531d5ddd60bf46b3d48f1e ]

When devm_kcalloc() fails, the error code -ENOMEM should be returned
instead of -EINVAL.

Signed-off-by: Zhen Lei <thunder.leizhen@huawei.com>
Link: https://lore.kernel.org/r/20210617103729.1918-1-thunder.leizhen@huawei.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c
index b927f9c81d922..e69a7f8b61634 100644
--- a/sound/soc/soc-core.c
+++ b/sound/soc/soc-core.c
@@ -3394,7 +3394,7 @@ int snd_soc_of_parse_audio_routing(struct snd_soc_card *card,
 	if (!routes) {
 		dev_err(card->dev,
 			"ASoC: Could not allocate DAPM route table\n");
-		return -EINVAL;
+		return -ENOMEM;
 	}
 
 	for (i = 0; i < num_routes; i++) {