diff options
| author | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-23 20:10:28 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@opensource.wolfsonmicro.com> | 2011-06-23 20:10:28 +0100 |
| commit | 1ae4e9b99682adfe9ae170ed593f26fe89eb65b5 (patch) | |
| tree | a8f367c65d19d54e7e624b99f36720c86bf7f067 /sound/soc/pxa/pxa2xx-pcm.c | |
| parent | df1553c8debddc10c6fa9ebe39f5acf5b13bb190 (diff) | |
| parent | 53dea36c70c1857149a8c447224e3936eb8b5339 (diff) | |
| download | lwn-1ae4e9b99682adfe9ae170ed593f26fe89eb65b5.tar.gz lwn-1ae4e9b99682adfe9ae170ed593f26fe89eb65b5.zip | |
Merge branch 'for-3.0' into for-3.1
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 d73d6f6fb12d..da28394c5e56 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) |