ALSA: ASoC: pxa-ssp: Correct check for stream presence
Subsystems (3)
PATCH 1/1 ALSA: 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 Daniel Mack <[email protected]>
--- sound/soc/pxa/pxa2xx-pcm.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
sound/soc/pxa/pxa2xx-pcm.c +2 -2
@@ -97,14 +97,14 @@ static int pxa2xx_soc_pcm_new(struct snd_soc_pcm_runtime *rtd)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)
Signature · 1 line
1.7.5.4
Quoted 6 lines · Daniel Mack
Don't rely on the codec's
channels_mininformation to decide wheter or not allocate a substream's DMA buffer. Rather check if the substream itself was allocated previously.Signed-off-by Daniel Mack <[email protected]>---
Acked-by Liam Girdwood <[email protected]>
Mark Brown
AppliedQuoted 5 lines · Daniel Mack
Don't rely on the codec's
channels_mininformation to decide wheter or not allocate a substream's DMA buffer. Rather check if the substream itself was allocated previously.Signed-off-by Daniel Mack <[email protected]>
Applied, thanks.