summaryrefslogtreecommitdiffstats
path: root/sound/pci/emu10k1
diff options
context:
space:
mode:
authorJames Courtier-Dutton <James@superbug.co.uk>2007-07-26 18:44:49 +0100
committerJaroslav Kysela <perex@perex.cz>2007-10-16 15:58:04 +0200
commitc93d1c25be410c0378d1d3d9e7efab06bf6a1261 (patch)
tree1b8ee4e8346966e10ca0a9442dd813fb511aa36b /sound/pci/emu10k1
parentf93abe51e8dc7e929d29e6a9a1991bf7fd234d4a (diff)
downloadlinux-stable-c93d1c25be410c0378d1d3d9e7efab06bf6a1261.tar.gz
linux-stable-c93d1c25be410c0378d1d3d9e7efab06bf6a1261.tar.bz2
linux-stable-c93d1c25be410c0378d1d3d9e7efab06bf6a1261.zip
[ALSA] snd-emu10k1:Unmute the Audio/Micro Dock after firmware load.
Signed-off-by: James Courtier-Dutton <James@superbug.co.uk> Signed-off-by: Jaroslav Kysela <perex@suse.cz>
Diffstat (limited to 'sound/pci/emu10k1')
-rw-r--r--sound/pci/emu10k1/emu10k1_main.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/pci/emu10k1/emu10k1_main.c b/sound/pci/emu10k1/emu10k1_main.c
index e22bb717e96a..f55395bc911e 100644
--- a/sound/pci/emu10k1/emu10k1_main.c
+++ b/sound/pci/emu10k1/emu10k1_main.c
@@ -752,6 +752,12 @@ int emu1010_firmware_thread(void *data) {
snd_emu1010_fpga_read(emu, EMU_DOCK_MAJOR_REV, &tmp );
snd_emu1010_fpga_read(emu, EMU_DOCK_MINOR_REV, &tmp2 );
snd_printk("Audio Dock ver:%d.%d\n",tmp ,tmp2);
+ /* Sync clocking between 1010 and Dock */
+ /* Allow DLL to settle */
+ msleep(10);
+ /* Unmute all. Default is muted after a firmware load */
+ snd_emu1010_fpga_write(emu, EMU_HANA_UNMUTE, EMU_UNMUTE );
+ break;
}
}
return 0;