git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'sh-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...
[pandora-kernel.git]
/
sound
/
soc
/
pxa
/
pxa2xx-pcm.c
diff --git
a/sound/soc/pxa/pxa2xx-pcm.c
b/sound/soc/pxa/pxa2xx-pcm.c
index
2ce0b2d
..
fab20a5
100644
(file)
--- 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 (!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;
}
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)
ret = pxa2xx_pcm_preallocate_dma_buffer(pcm,
SNDRV_PCM_STREAM_CAPTURE);
if (ret)