From c3d13ce87c003e3cd58977167958f0cffb66c9f3 Mon Sep 17 00:00:00 2001 From: Raymond Yau Date: Sat, 7 Jan 2012 14:35:17 +0800 Subject: [PATCH] --- yaml --- r: 284138 b: refs/heads/master c: fb65c2dfe60d38be6b9193d0b85e66e780cd4373 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/au88x0/au88x0_core.c | 2 -- trunk/sound/pci/au88x0/au88x0_pcm.c | 3 +-- 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index afd69f5b0d08..271acf9525d8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ae4e1f7a0dab95f7e6049272cdb59c7bdc34365 +refs/heads/master: fb65c2dfe60d38be6b9193d0b85e66e780cd4373 diff --git a/trunk/sound/pci/au88x0/au88x0_core.c b/trunk/sound/pci/au88x0/au88x0_core.c index d49e2c5ecb75..6933a27a5d76 100644 --- a/trunk/sound/pci/au88x0/au88x0_core.c +++ b/trunk/sound/pci/au88x0/au88x0_core.c @@ -1336,7 +1336,6 @@ static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma) dma->fifo_status = FIFO_PAUSE; } -#if 0 // Using pause instead static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma) { stream_t *dma = &vortex->dma_adb[adbdma]; @@ -1351,7 +1350,6 @@ static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma) dma->fifo_enabled = 0; } -#endif /* WTDMA */ #ifndef CHIP_AU8810 diff --git a/trunk/sound/pci/au88x0/au88x0_pcm.c b/trunk/sound/pci/au88x0/au88x0_pcm.c index 509969038ac5..0488633ea874 100644 --- a/trunk/sound/pci/au88x0/au88x0_pcm.c +++ b/trunk/sound/pci/au88x0/au88x0_pcm.c @@ -353,8 +353,7 @@ static int snd_vortex_pcm_trigger(struct snd_pcm_substream *substream, int cmd) //printk(KERN_INFO "vortex: stop %d\n", dma); stream->fifo_enabled = 0; if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT) - vortex_adbdma_pausefifo(chip, dma); - //vortex_adbdma_stopfifo(chip, dma); + vortex_adbdma_stopfifo(chip, dma); #ifndef CHIP_AU8810 else { printk(KERN_INFO "vortex: wt stop %d\n", dma);