diff options
author | Raymond Yau <superquad.vortex2@gmail.com> | 2012-01-07 01:35:17 -0500 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2012-01-08 08:39:26 -0500 |
commit | fb65c2dfe60d38be6b9193d0b85e66e780cd4373 (patch) | |
tree | 3d7d1c943f145a2f6ce7cd9ccc8e35f3eb0be614 /sound | |
parent | 3ae4e1f7a0dab95f7e6049272cdb59c7bdc34365 (diff) |
ALSA: Au88x0 - Fix channels swapping of 4 channels playback
Fix channels swapping of 4 channels playback by
using vortex_adbdma_stopfifo instead of vortex_adbdma_pausefifo
for SNDRV_PCM_TRIGGER_STOP event
Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/pci/au88x0/au88x0_core.c | 2 | ||||
-rw-r--r-- | sound/pci/au88x0/au88x0_pcm.c | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/sound/pci/au88x0/au88x0_core.c b/sound/pci/au88x0/au88x0_core.c index d49e2c5ecb75..6933a27a5d76 100644 --- a/sound/pci/au88x0/au88x0_core.c +++ b/sound/pci/au88x0/au88x0_core.c | |||
@@ -1336,7 +1336,6 @@ static void vortex_adbdma_pausefifo(vortex_t * vortex, int adbdma) | |||
1336 | dma->fifo_status = FIFO_PAUSE; | 1336 | dma->fifo_status = FIFO_PAUSE; |
1337 | } | 1337 | } |
1338 | 1338 | ||
1339 | #if 0 // Using pause instead | ||
1340 | static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma) | 1339 | static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma) |
1341 | { | 1340 | { |
1342 | stream_t *dma = &vortex->dma_adb[adbdma]; | 1341 | stream_t *dma = &vortex->dma_adb[adbdma]; |
@@ -1351,7 +1350,6 @@ static void vortex_adbdma_stopfifo(vortex_t * vortex, int adbdma) | |||
1351 | dma->fifo_enabled = 0; | 1350 | dma->fifo_enabled = 0; |
1352 | } | 1351 | } |
1353 | 1352 | ||
1354 | #endif | ||
1355 | /* WTDMA */ | 1353 | /* WTDMA */ |
1356 | 1354 | ||
1357 | #ifndef CHIP_AU8810 | 1355 | #ifndef CHIP_AU8810 |
diff --git a/sound/pci/au88x0/au88x0_pcm.c b/sound/pci/au88x0/au88x0_pcm.c index 509969038ac5..0488633ea874 100644 --- a/sound/pci/au88x0/au88x0_pcm.c +++ b/sound/pci/au88x0/au88x0_pcm.c | |||
@@ -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); |