]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
ASoC: core: Invoke pcm_new() for all DAI-link
authorRohit kumar <rohitkr@codeaurora.org>
Thu, 1 Nov 2018 12:38:49 +0000 (18:08 +0530)
committerMark Brown <broonie@kernel.org>
Thu, 13 Dec 2018 17:54:07 +0000 (17:54 +0000)
Remove no_pcm check to invoke pcm_new() for backend dai-links
too. This fixes crash in hdmi codec driver during hdmi_codec_startup()
while accessing chmap_info struct. chmap_info struct memory is
allocated in pcm_new() of hdmi codec driver which is not invoked
in case of DPCM when hdmi codec driver is part of backend dai-link.

Below is the crash stack:

[   61.635493] Unable to handle kernel NULL pointer dereference at virtual address 00000018
..
[   61.666696]   CM = 0, WnR = 1
[   61.669778] user pgtable: 4k pages, 39-bit VAs, pgd = ffffffc0d6633000
[   61.676526] [0000000000000018] *pgd=0000000153fc8003, *pud=0000000153fc8003, *pmd=0000000000000000
[   61.685793] Internal error: Oops: 96000046 [#1] PREEMPT SMP
[   61.722955] CPU: 7 PID: 2238 Comm: aplay Not tainted 4.14.72 #21
..
[   61.740269] PC is at hdmi_codec_startup+0x124/0x164
[   61.745308] LR is at hdmi_codec_startup+0xe4/0x164

Signed-off-by: Rohit kumar <rohitkr@codeaurora.org>
Signed-off-by: Mark Brown <broonie@kernel.org>
sound/soc/soc-core.c

index b0db59e6339d97695848dcebf3ebc8a0de7330b9..0462b3ec977a221a5d7869d3e7afb02e36cd7e5a 100644 (file)
@@ -1467,7 +1467,7 @@ static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais,
        for (i = 0; i < num_dais; ++i) {
                struct snd_soc_dai_driver *drv = dais[i]->driver;
 
-               if (!rtd->dai_link->no_pcm && drv->pcm_new)
+               if (drv->pcm_new)
                        ret = drv->pcm_new(rtd, dais[i]);
                if (ret < 0) {
                        dev_err(dais[i]->dev,