ASoC: soc-topology: fix modern dai link style
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Wed, 12 Jun 2019 16:38:45 +0000 (11:38 -0500)
committerMark Brown <broonie@kernel.org>
Thu, 13 Jun 2019 18:47:14 +0000 (19:47 +0100)
The topology code can create a FE DAI link but did not allocate the
memory for a platform component - whose name can be overridden at a
later time.

Fixes: 23b946ce2808b ("ASoC: soc-topology: use modern dai_link style")
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-topology.c

index f485f7f751a1ddcdd9f1466f41c1cfb37a763ee8..b538412e4bcff3a295dd9ced4303bb589bd9102f 100644 (file)
@@ -1882,8 +1882,8 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
        struct snd_soc_dai_link_component *dlc;
        int ret;
 
-       /* link + cpu + codec */
-       link = kzalloc(sizeof(*link) + (2 * sizeof(*dlc)), GFP_KERNEL);
+       /* link + cpu + codec + platform */
+       link = kzalloc(sizeof(*link) + (3 * sizeof(*dlc)), GFP_KERNEL);
        if (link == NULL)
                return -ENOMEM;
 
@@ -1891,9 +1891,11 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
 
        link->cpus      = &dlc[0];
        link->codecs    = &dlc[1];
+       link->platforms = &dlc[2];
 
        link->num_cpus   = 1;
        link->num_codecs = 1;
+       link->num_platforms = 1;
 
        if (strlen(pcm->pcm_name)) {
                link->name = kstrdup(pcm->pcm_name, GFP_KERNEL);
@@ -1907,6 +1909,8 @@ static int soc_tplg_fe_link_create(struct soc_tplg *tplg,
        link->codecs->name = "snd-soc-dummy";
        link->codecs->dai_name = "snd-soc-dummy-dai";
 
+       link->platforms->name = "snd-soc-dummy";
+
        /* enable DPCM */
        link->dynamic = 1;
        link->dpcm_playback = le32_to_cpu(pcm->playback);