diff options
Diffstat (limited to 'sound/pci/au88x0/au88x0_pcm.c')
-rw-r--r-- | sound/pci/au88x0/au88x0_pcm.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c index c5f7ae46afe..0488633ea87 100644 --- a/sound/pci/au88x0/au88x0_pcm.c +++ b/sound/pci/au88x0/au88x0_pcm.c | |||
@@ -307,8 +307,8 @@ static int snd_vortex_pcm_prepare(struct snd_pcm_substream *substream) | |||
307 | fmt = vortex_alsafmt_aspfmt(runtime->format); | 307 | fmt = vortex_alsafmt_aspfmt(runtime->format); |
308 | spin_lock_irq(&chip->lock); | 308 | spin_lock_irq(&chip->lock); |
309 | if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT) { | 309 | if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT) { |
310 | vortex_adbdma_setmode(chip, dma, 1, dir, fmt, 0 /*? */ , | 310 | vortex_adbdma_setmode(chip, dma, 1, dir, fmt, |
311 | 0); | 311 | runtime->channels == 1 ? 0 : 1, 0); |
312 | vortex_adbdma_setstartbuffer(chip, dma, 0); | 312 | vortex_adbdma_setstartbuffer(chip, dma, 0); |
313 | if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_SPDIF) | 313 | if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_SPDIF) |
314 | vortex_adb_setsrc(chip, dma, runtime->rate, dir); | 314 | vortex_adb_setsrc(chip, dma, runtime->rate, dir); |
@@ -353,8 +353,7 @@ static int snd_vortex_pcm_trigger(struct snd_pcm_substream *substream, int cmd) | |||
353 | //printk(KERN_INFO "vortex: stop %d\n", dma); | 353 | //printk(KERN_INFO "vortex: stop %d\n", dma); |
354 | stream->fifo_enabled = 0; | 354 | stream->fifo_enabled = 0; |
355 | if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT) | 355 | if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT) |
356 | vortex_adbdma_pausefifo(chip, dma); | 356 | vortex_adbdma_stopfifo(chip, dma); |
357 | //vortex_adbdma_stopfifo(chip, dma); | ||
358 | #ifndef CHIP_AU8810 | 357 | #ifndef CHIP_AU8810 |
359 | else { | 358 | else { |
360 | printk(KERN_INFO "vortex: wt stop %d\n", dma); | 359 | printk(KERN_INFO "vortex: wt stop %d\n", dma); |