summaryrefslogtreecommitdiff
path: root/src/topology
diff options
context:
space:
mode:
authorMengdong Lin <mengdong.lin@linux.intel.com>2016-04-29 11:03:30 +0800
committerTakashi Iwai <tiwai@suse.de>2016-05-09 10:30:40 +0200
commit5d23c406d1757d1b65e1d17a71c69620d9af71d7 (patch)
treefc733f9f98c2fd04294046d15874328009a52baf /src/topology
parent0935e32d40e065e61255550ac4c5b7c6710dd028 (diff)
downloadalsa-lib-5d23c406d1757d1b65e1d17a71c69620d9af71d7.tar.gz
topology: Fix pcm ID & name parsing
The name and ID of SectionPCM should be set to pcm_name and pcm_id, for a front-end DAI link in the kernel, not for the front-end DAI of the link. Signed-off-by: Mengdong Lin <mengdong.lin@linux.intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'src/topology')
-rw-r--r--src/topology/pcm.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/topology/pcm.c b/src/topology/pcm.c
index 1df4f54d..16618216 100644
--- a/src/topology/pcm.c
+++ b/src/topology/pcm.c
@@ -337,7 +337,7 @@ int tplg_parse_pcm(snd_tplg_t *tplg,
pcm = elem->pcm;
pcm->size = elem->size;
- elem_copy_text(pcm->dai_name, elem->id, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+ elem_copy_text(pcm->pcm_name, elem->id, SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
tplg_dbg(" PCM: %s\n", elem->id);
@@ -366,8 +366,8 @@ int tplg_parse_pcm(snd_tplg_t *tplg,
if (snd_config_get_string(n, &val) < 0)
return -EINVAL;
- pcm->dai_id = atoi(val);
- tplg_dbg("\t%s: %d\n", id, pcm->dai_id);
+ pcm->pcm_id = atoi(val);
+ tplg_dbg("\t%s: %d\n", id, pcm->pcm_id);
continue;
}