Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 584cb84e authored by Kuninori Morimoto's avatar Kuninori Morimoto Committed by Greg Kroah-Hartman
Browse files

ASoC: soc-compress.c: fixup private_data on snd_soc_new_compress() 

[ Upstream commit ffe4c0f0bfaa571a676a0e946d4a6a0607f94294 ]

commit d3268a40 ("ASoC: soc-compress.c: fix NULL dereference")
enables DPCM capture, but it should independent from playback.
This patch fixup it.

Fixes: d3268a40 ("ASoC: soc-compress.c: fix NULL dereference")
Link: https://lore.kernel.org/r/87tu0i6j7j.wl-kuninori.morimoto.gx@renesas.com


Acked-by: default avatarCharles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarKuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Link: https://lore.kernel.org/r/871qnkvo1s.wl-kuninori.morimoto.gx@renesas.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a161f1d9

sound/soc/soc-compress.c

+1 −1
Original line number Diff line number Diff line
@@ -927,7 +927,7 @@ int snd_soc_new_compress(struct snd_soc_pcm_runtime *rtd, int num) 
		rtd->fe_compr = 1;

		if (rtd->dai_link->dpcm_playback)

			be_pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream->private_data = rtd;

		else if (rtd->dai_link->dpcm_capture)

		if (rtd->dai_link->dpcm_capture)

			be_pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream->private_data = rtd;

		memcpy(compr->ops, &soc_compr_dyn_ops, sizeof(soc_compr_dyn_ops));

	} else {