summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorZhen Lei <thunder.leizhen@huawei.com>2021-06-17 18:37:29 +0800
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-07-20 16:16:09 +0200
commitb638d66d2980346713f5bc5d4637481520143bc0 (patch)
treefaed41b54208b0702843ce82f243b40cd605c4a5 /sound
parentb65f7b435e022a74d6777f67b3ae12f960ea26d3 (diff)
downloadlinux-stable-b638d66d2980346713f5bc5d4637481520143bc0.tar.gz
linux-stable-b638d66d2980346713f5bc5d4637481520143bc0.tar.bz2
linux-stable-b638d66d2980346713f5bc5d4637481520143bc0.zip
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>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/soc-core.c2
1 files changed, 1 insertions, 1 deletions
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++) {