hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ASoC: soc-core.c: fixup snd_soc_of_get_dai_link_cpus() 

commit 900dedd7e4 ("ASoC: Introduce snd_soc_of_get_dai_link_cpus")
adds new snd_soc_of_get_dai_link_cpus(), but it is using
"codec" everywhere. It is very strange, and is issue when error case.
It should call cpu instead of codec in error case.
This patch tidyup it.

Fixes: 900dedd7e4 ("ASoC: Introduce snd_soc_of_get_dai_link_cpus")
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Reviewed-by: Martin Povišer <povik+lin@cutebit.org>
Link: https://lore.kernel.org/r/87zgi5p7k1.wl-kuninori.morimoto.gx@renesas.com
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Kuninori Morimoto 2022-06-22 05:54:06 +00:00 committed by Mark Brown
parent fc34ece41f
commit 586fb26413
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
sound/soc/soc-core.c
View File

@ -3424,26 +3424,26 @@ int snd_soc_of_get_dai_link_cpus(struct device *dev,
struct of_phandle_args args;
struct snd_soc_dai_link_component *component;
char *name;
int index, num_codecs, ret;
int index, num_cpus, ret;
/* Count the number of CODECs */
/* Count the number of CPUs */
name = "sound-dai";
num_codecs = of_count_phandle_with_args(of_node, name,
num_cpus = of_count_phandle_with_args(of_node, name,
"#sound-dai-cells");
if (num_codecs <= 0) {
if (num_codecs == -ENOENT)
if (num_cpus <= 0) {
if (num_cpus == -ENOENT)
dev_err(dev, "No 'sound-dai' property\n");
else
dev_err(dev, "Bad phandle in 'sound-dai'\n");
return num_codecs;
return num_cpus;
}
component = devm_kcalloc(dev,
num_codecs, sizeof(*component),
num_cpus, sizeof(*component),
GFP_KERNEL);
if (!component)
return -ENOMEM;
dai_link->cpus = component;
dai_link->num_cpus = num_codecs;
dai_link->num_cpus = num_cpus;
/* Parse the list */
for_each_link_cpus(dai_link, index, component) {
@ -3459,7 +3459,7 @@ int snd_soc_of_get_dai_link_cpus(struct device *dev,
}
return 0;
err:
snd_soc_of_put_dai_link_codecs(dai_link);
snd_soc_of_put_dai_link_cpus(dai_link);
dai_link->cpus = NULL;
dai_link->num_cpus = 0;
return ret;