diff options
| author | Takashi Iwai <tiwai@suse.de> | 2011-10-27 10:43:40 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2011-10-27 10:43:40 +0200 |
| commit | bb14eb0da72afb69be261b28ec858cbd5a35e089 (patch) | |
| tree | fa72a87d21e506c990b63657d782936311cfa7cf /sound/soc/omap/omap-pcm.c | |
| parent | 9430148d800dd929ad73da4c6afb67f793f8af43 (diff) | |
| parent | 5927f94700e860ae27ff24e7f3bc9e4f7b9922eb (diff) | |
| download | linux-bb14eb0da72afb69be261b28ec858cbd5a35e089.tar.gz linux-bb14eb0da72afb69be261b28ec858cbd5a35e089.tar.bz2 linux-bb14eb0da72afb69be261b28ec858cbd5a35e089.zip | |
Merge branch 'topic/asoc' into for-linus
Diffstat (limited to 'sound/soc/omap/omap-pcm.c')
| -rw-r--r-- | sound/soc/omap/omap-pcm.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/sound/soc/omap/omap-pcm.c b/sound/soc/omap/omap-pcm.c index 9b5c88ac35b9..5e37ec915de2 100644 --- a/sound/soc/omap/omap-pcm.c +++ b/sound/soc/omap/omap-pcm.c @@ -198,6 +198,14 @@ static int omap_pcm_prepare(struct snd_pcm_substream *substream) OMAP_DMA_LAST_IRQ | OMAP_DMA_BLOCK_IRQ); else if (!substream->runtime->no_period_wakeup) omap_enable_dma_irq(prtd->dma_ch, OMAP_DMA_FRAME_IRQ); + else { + /* + * No period wakeup: + * we need to disable BLOCK_IRQ, which is enabled by the omap + * dma core at request dma time. + */ + omap_disable_dma_irq(prtd->dma_ch, OMAP_DMA_BLOCK_IRQ); + } if (!(cpu_class_is_omap1())) { omap_set_dma_src_burst_mode(prtd->dma_ch, |