[PATCH] ALSA: ASoC: pxa-ssp: Correct check for stream presence

[PATCH] ALSA: ASoC: pxa-ssp: Correct check for stream presence

[Daniel Mack]

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 <zonque@gmail.com>
---
 sound/soc/pxa/pxa2xx-pcm.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/sound/soc/pxa/pxa2xx-pcm.c b/sound/soc/pxa/pxa2xx-pcm.c
index d73d6f6..da28394 100644
--- a/sound/soc/pxa/pxa2xx-pcm.c
+++ b/sound/soc/pxa/pxa2xx-pcm.c
@@ -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)
-- 
1.7.5.4

Re: [PATCH] ALSA: ASoC: pxa-ssp: Correct check for stream presence

[Liam Girdwood]

On 22/06/11 19:48, Daniel Mack wrote:
> 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 <zonque@gmail.com>
> ---

Acked-by: Liam Girdwood <lrg@ti.com>

Re: [PATCH] ALSA: ASoC: pxa-ssp: Correct check for stream presence

[Mark Brown]

On Wed, Jun 22, 2011 at 08:48:25PM +0200, Daniel Mack wrote:
> 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 <zonque@gmail.com>

Applied, thanks.