diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 20:52:23 +0900 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-08-20 20:52:23 +0900 |
| commit | b9afa3e015273a52718e0a7efe198a0df76be880 (patch) | |
| tree | 88cf67276533fcd5622d4cc2165ba889a98bb0db /sound/pci/emu10k1/memory.c | |
| parent | 144c7494239f12d554806439a17ad8203c7b2d3a (diff) | |
| parent | 763008c4357b73c8d18396dfd8d79dc58fa3f99d (diff) | |
| download | op-kernel-dev-b9afa3e015273a52718e0a7efe198a0df76be880.zip op-kernel-dev-b9afa3e015273a52718e0a7efe198a0df76be880.tar.gz | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
arch/sh/kernel/process_32.c
Signed-off-by: Paul Mundt <lethal@linux-sh.org>
Diffstat (limited to 'sound/pci/emu10k1/memory.c')
| -rw-r--r-- | sound/pci/emu10k1/memory.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sound/pci/emu10k1/memory.c b/sound/pci/emu10k1/memory.c index ffb1ddb..957a311 100644 --- a/sound/pci/emu10k1/memory.c +++ b/sound/pci/emu10k1/memory.c @@ -310,8 +310,10 @@ snd_emu10k1_alloc_pages(struct snd_emu10k1 *emu, struct snd_pcm_substream *subst if (snd_BUG_ON(!hdr)) return NULL; + idx = runtime->period_size >= runtime->buffer_size ? + (emu->delay_pcm_irq * 2) : 0; mutex_lock(&hdr->block_mutex); - blk = search_empty(emu, runtime->dma_bytes); + blk = search_empty(emu, runtime->dma_bytes + idx); if (blk == NULL) { mutex_unlock(&hdr->block_mutex); return NULL; |
