]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ASoC: soc-core: Fix the error return code in snd_soc_of_parse_audio_routing()
authorZhen Lei <thunder.leizhen@huawei.com>
Thu, 17 Jun 2021 10:37:29 +0000 (18:37 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 20 Jul 2021 14:02:09 +0000 (16:02 +0200)
[ 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>
sound/soc/soc-core.c

index 6680c12716d449d6228f3c61f31a131178f4d25d..6d4b08e918decb75a9b2d3c48fb3b7acf658ea1e 100644 (file)
@@ -2796,7 +2796,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++) {