aboutsummaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2008-06-23 05:45:47 -0400
committerJaroslav Kysela <perex@perex.cz>2008-06-26 03:01:38 -0400
commit981bcead3f2279a1ec6fb5f2c57aff79ed61a700 (patch)
tree8608b3eb1f35410364aa117cba37613d146ad5e8 /sound
parent1d11604eebfc91204e3182b48d3d920f51b09d40 (diff)
ALSA: trident - pause s/pdif output
Stop the S/PDIF DMA engine and output when the device is told to pause. It will keep on looping the current buffer contents if this isn't done. Signed-off-by: Pierre Ossman <drzeus@drzeus.cx> Tested-by: Rene Herman <rene.herman@gmail.com> Signed-off-by: Takashi Iwai <tiwai@suse.de> Signed-off-by: Jaroslav Kysela <perex@perex.cz>
Diffstat (limited to 'sound')
-rw-r--r--sound/pci/trident/trident_main.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/sound/pci/trident/trident_main.c b/sound/pci/trident/trident_main.c
index bbcee2c09ae4..a69b4206c69e 100644
--- a/sound/pci/trident/trident_main.c
+++ b/sound/pci/trident/trident_main.c
@@ -1590,7 +1590,10 @@ static int snd_trident_trigger(struct snd_pcm_substream *substream,
1590 if (spdif_flag) { 1590 if (spdif_flag) {
1591 if (trident->device != TRIDENT_DEVICE_ID_SI7018) { 1591 if (trident->device != TRIDENT_DEVICE_ID_SI7018) {
1592 outl(trident->spdif_pcm_bits, TRID_REG(trident, NX_SPCSTATUS)); 1592 outl(trident->spdif_pcm_bits, TRID_REG(trident, NX_SPCSTATUS));
1593 outb(trident->spdif_pcm_ctrl, TRID_REG(trident, NX_SPCTRL_SPCSO + 3)); 1593 val = trident->spdif_pcm_ctrl;
1594 if (!go)
1595 val &= ~(0x28);
1596 outb(val, TRID_REG(trident, NX_SPCTRL_SPCSO + 3));
1594 } else { 1597 } else {
1595 outl(trident->spdif_pcm_bits, TRID_REG(trident, SI_SPDIF_CS)); 1598 outl(trident->spdif_pcm_bits, TRID_REG(trident, SI_SPDIF_CS));
1596 val = inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL)) | SPDIF_EN; 1599 val = inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL)) | SPDIF_EN;