diff options
author | 2012-01-12 09:59:14 +0100 | |
---|---|---|
committer | 2012-01-12 09:59:14 +0100 | |
commit | 627b79628f56c3deeb17dec1edf6899b49552fa4 (patch) | |
tree | deac8b2cce5d70708fa944a270ee031f069226d8 /sound/pci/au88x0/au88x0_pcm.c | |
parent | Merge branch 'for-3.3' of git://git.kernel.org/pub/scm/linux/kernel/git/broon... (diff) | |
parent | ALSA: usb-audio: add Yamaha MOX6/MOX8 support (diff) | |
download | linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.gz linux-627b79628f56c3deeb17dec1edf6899b49552fa4.tar.bz2 linux-627b79628f56c3deeb17dec1edf6899b49552fa4.zip |
Merge branch 'topic/misc' into for-linus
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 c5f7ae46afef..0488633ea874 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) fmt = vortex_alsafmt_aspfmt(runtime->format); spin_lock_irq(&chip->lock); if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_WT) { - vortex_adbdma_setmode(chip, dma, 1, dir, fmt, 0 /*? */ , - 0); + vortex_adbdma_setmode(chip, dma, 1, dir, fmt, + runtime->channels == 1 ? 0 : 1, 0); vortex_adbdma_setstartbuffer(chip, dma, 0); if (VORTEX_PCM_TYPE(substream->pcm) != VORTEX_PCM_SPDIF) 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) //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); |