summaryrefslogtreecommitdiff
path: root/sound
diff options
context:
space:
mode:
authorPierre Ossman <drzeus@drzeus.cx>2008-07-18 19:04:27 -0400
committerGreg Kroah-Hartman <gregkh@suse.de>2008-08-01 11:50:49 -0700
commit97ed97fb560c5e40eb6dbed8b2ba01a1a4bc22ca (patch)
tree4b1c8d0e945da63f807bf791fe86dc738f45e3b6 /sound
parentd74797166a181f7aa1f0fdfbabe9944e87823074 (diff)
ALSA: trident - pause s/pdif output
Commit 981bcead3f2279a1ec6fb5f2c57aff79ed61a700 upstream. 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> Cc: Chuck Ebbert <cebbert@redhat.com> Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
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 71138ff9b310..a9b40a1d4ee0 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,
if (spdif_flag) {
if (trident->device != TRIDENT_DEVICE_ID_SI7018) {
outl(trident->spdif_pcm_bits, TRID_REG(trident, NX_SPCSTATUS));
- outb(trident->spdif_pcm_ctrl, TRID_REG(trident, NX_SPCTRL_SPCSO + 3));
+ val = trident->spdif_pcm_ctrl;
+ if (!go)
+ val &= ~(0x28);
+ outb(val, TRID_REG(trident, NX_SPCTRL_SPCSO + 3));
} else {
outl(trident->spdif_pcm_bits, TRID_REG(trident, SI_SPDIF_CS));
val = inl(TRID_REG(trident, SI_SERIAL_INTF_CTRL)) | SPDIF_EN;