diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-06-24 12:36:25 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-06-24 12:36:25 +0200 |
| commit | e0938118576954ac4deafbdb9950cebd34f726c6 (patch) | |
| tree | 87000bd3ce37651b4b559489e7f1f6dbd4385e0c /sound/soc/pxa/pxa2xx-pcm.c | |
| parent | 16866741bda5d16f3d30d1656ce941faf5dad34c (diff) | |
| parent | 53dea36c70c1857149a8c447224e3936eb8b5339 (diff) | |
Merge branch 'fix/asoc' into for-linus
Diffstat (limited to 'sound/soc/pxa/pxa2xx-pcm.c')
| -rw-r--r-- | 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 2ce0b2d891d5..fab20a54e863 100644 --- a/sound/soc/pxa/pxa2xx-pcm.c +++ b/sound/soc/pxa/pxa2xx-pcm.c @@ -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) |