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

Commit 53dea36c authored by Daniel Mack's avatar Daniel Mack Committed by Mark Brown
Browse files

ASoC: pxa-ssp: Correct check for stream presence 



Don't rely on the codec's channels_min information to decide wheter or
not allocate a substream's DMA buffer. Rather check if the substream
itself was allocated previously.

Signed-off-by: default avatarDaniel Mack <zonque@gmail.com>
Acked-by: default avatarLiam Girdwood <lrg@ti.com>
Signed-off-by: default avatarMark Brown <broonie@opensource.wolfsonmicro.com>
Cc: stable@kernel.org
parent 96dcabb9

sound/soc/pxa/pxa2xx-pcm.c

+2 −2
Original line number Diff line number Diff line
@@ -95,14 +95,14 @@ static int pxa2xx_soc_pcm_new(struct snd_card *card, struct snd_soc_dai *dai, 
	if (!card->dev->coherent_dma_mask)

		card->dev->coherent_dma_mask = DMA_BIT_MASK(32);



	if (dai->driver->playback.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_PLAYBACK].substream) {

		ret = pxa2xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_PLAYBACK);

		if (ret)

			goto out;

	}



	if (dai->driver->capture.channels_min) {

	if (pcm->streams[SNDRV_PCM_STREAM_CAPTURE].substream) {

		ret = pxa2xx_pcm_preallocate_dma_buffer(pcm,

			SNDRV_PCM_STREAM_CAPTURE);

		if (ret)