Skip to content

Commit 3f53d57

Browse files
rohkkumarplbossart
authored andcommitted
ASoC: core: Invoke pcm_new() for all DAI-link
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> (cherry picked from commit de17f14)
1 parent b49de46 commit 3f53d57

1 file changed

Lines changed: 1 addition & 1 deletion

File tree

sound/soc/soc-core.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1467,7 +1467,7 @@ static int soc_link_dai_pcm_new(struct snd_soc_dai **dais, int num_dais,
14671467
for (i = 0; i < num_dais; ++i) {
14681468
struct snd_soc_dai_driver *drv = dais[i]->driver;
14691469

1470-
if (!rtd->dai_link->no_pcm && drv->pcm_new)
1470+
if (drv->pcm_new)
14711471
ret = drv->pcm_new(rtd, dais[i]);
14721472
if (ret < 0) {
14731473
dev_err(dais[i]->dev,

0 commit comments

Comments
 (0)