diff mbox series

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

Message ID 871qnkvo1s.wl-kuninori.morimoto.gx@renesas.com
State Accepted
Commit ffe4c0f0bfaa571a676a0e946d4a6a0607f94294
Headers show
Series ASoC: soc-compress.c: fixup private_data on snd_soc_new_compress() | expand

Commit Message

Kuninori Morimoto Jan. 23, 2023, 11:17 p.m. UTC 
From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>

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

Fixes: d3268a40d4b1 ("ASoC: soc-compress.c: fix NULL dereference")
Acked-by: Charles Keepax <ckeepax@opensource.cirrus.com>
Acked-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
---
> Need Intel's Tested-by ?

 sound/soc/soc-compress.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Mark Brown Jan. 28, 2023, 5:18 p.m. UTC | #1 
On Mon, 23 Jan 2023 23:17:20 +0000, Kuninori Morimoto wrote:
> commit d3268a40d4b19f ("ASoC: soc-compress.c: fix NULL dereference")
> enables DPCM capture, but it should independent from playback.
> This patch fixup it.
> 
> 

Applied to

   broonie/sound.git for-next

Thanks!

[1/1] ASoC: soc-compress.c: fixup private_data on snd_soc_new_compress()
      commit: ffe4c0f0bfaa571a676a0e946d4a6a0607f94294

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark
diff mbox series

Patch

diff --git a/sound/soc/soc-compress.c b/sound/soc/soc-compress.c
index b2a6bbb4e807..ed9e910659ab 100644
--- a/sound/soc/soc-compress.c
+++ b/sound/soc/soc-compress.c
@@ -616,7 +616,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 {