diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:19 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-07-22 08:43:19 +0200 |
| commit | 13b137ef0367237909bb2dc38babfb8305154676 (patch) | |
| tree | a5d756fcc6603da970ef8c5e263244c6166a2fba /sound/soc/au1x | |
| parent | e8fd86efaa09445ca1afc1aea08d4666c966ed03 (diff) | |
| parent | 440085598672c0e3fde8a48495f61fea418b06d1 (diff) | |
| download | op-kernel-dev-13b137ef0367237909bb2dc38babfb8305154676.zip op-kernel-dev-13b137ef0367237909bb2dc38babfb8305154676.tar.gz | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/au1x')
| -rw-r--r-- | sound/soc/au1x/dbdma2.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sound/soc/au1x/dbdma2.c b/sound/soc/au1x/dbdma2.c index 10fdd28..20bb53a 100644 --- a/sound/soc/au1x/dbdma2.c +++ b/sound/soc/au1x/dbdma2.c @@ -319,10 +319,11 @@ static void au1xpsc_pcm_free_dma_buffers(struct snd_pcm *pcm) snd_pcm_lib_preallocate_free_for_all(pcm); } -static int au1xpsc_pcm_new(struct snd_card *card, - struct snd_soc_dai *dai, - struct snd_pcm *pcm) +static int au1xpsc_pcm_new(struct snd_soc_pcm_runtime *rtd) { + struct snd_card *card = rtd->card->snd_card; + struct snd_pcm *pcm = rtd->pcm; + snd_pcm_lib_preallocate_pages_for_all(pcm, SNDRV_DMA_TYPE_DEV, card->dev, AU1XPSC_BUFFER_MIN_BYTES, (4096 * 1024) - 1); |
