projects
/
platform
/
kernel
/
linux-stable.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
552e0bf
)
ALSA: trident - pause s/pdif output
author
Pierre Ossman
<drzeus@drzeus.cx>
Fri, 18 Jul 2008 23:04:27 +0000
(19:04 -0400)
committer
Greg Kroah-Hartman
<gregkh@suse.de>
Fri, 1 Aug 2008 19:43:07 +0000
(12:43 -0700)
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>
sound/pci/trident/trident_main.c
patch
|
blob
|
history
diff --git
a/sound/pci/trident/trident_main.c
b/sound/pci/trident/trident_main.c
index bbcee2c09ae42e15085cc91d0bcb1625b50118dd..a69b4206c69e205f9a88726f63182f75b36491ee 100644
(file)
--- 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;