From d49813c42ddd5253392075798e783ba72b19ea69 Mon Sep 17 00:00:00 2001 From: Zhen Lei Date: Fri, 23 Jul 2021 10:31:53 +0800 Subject: [PATCH] ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing() stable inclusion from linux-4.19.198 commit b638d66d2980346713f5bc5d4637481520143bc0 -------------------------------- [ Upstream commit 7d3865a10b9ff2669c531d5ddd60bf46b3d48f1e ] When devm_kcalloc() fails, the error code -ENOMEM should be returned instead of -EINVAL. Signed-off-by: Zhen Lei Link: https://lore.kernel.org/r/20210617103729.1918-1-thunder.leizhen@huawei.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin Signed-off-by: Yang Yingliang --- sound/soc/soc-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 595fe20bbc6d..8531b490f6f6 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3510,7 +3510,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++) { -- GitLab