diff options
| author | Zhen Lei <thunder.leizhen@huawei.com> | 2021-06-17 18:37:29 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-07-20 16:17:50 +0200 |
| commit | 5566bd69a5c57796c39517b01d35ebd8f5e32af4 (patch) | |
| tree | ed29e6c19b032617c84fd8f977f008ef86d31642 /sound/soc | |
| parent | 4d874bb93e0622f377f24c3e5c3d5b47cdd63d23 (diff) | |
| download | linux-stable-5566bd69a5c57796c39517b01d35ebd8f5e32af4.tar.gz linux-stable-5566bd69a5c57796c39517b01d35ebd8f5e32af4.tar.bz2 linux-stable-5566bd69a5c57796c39517b01d35ebd8f5e32af4.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/soc')
| -rw-r--r-- | sound/soc/soc-core.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 42c2a3065b77..2a172de37466 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -4046,7 +4046,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++) { |