diff options
author | Takashi Iwai <tiwai@suse.de> | 2006-01-04 10:00:48 -0500 |
---|---|---|
committer | Jaroslav Kysela <perex@suse.cz> | 2006-01-22 10:23:49 -0500 |
commit | 4d7d7596287588a953f450a3f18c5d4587f763d0 (patch) | |
tree | 9e0069a56e06ba3bf4cc77a4ab0554026c6a2517 /sound/pci/emu10k1 | |
parent | 59b1b34f47e6c8ac8f00660db2cd34216819b400 (diff) |
[ALSA] emu10k1 - Fix silence problems after suspend
Modules: EMU10K1/EMU10K2 driver
Fix silence problems on some boards after suspend/resume (bug#1674).
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/emu10k1')
-rw-r--r-- | sound/pci/emu10k1/emumixer.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sound/pci/emu10k1/emumixer.c b/sound/pci/emu10k1/emumixer.c index 2e86a901a0a4..8c912b1bee39 100644 --- a/sound/pci/emu10k1/emumixer.c +++ b/sound/pci/emu10k1/emumixer.c | |||
@@ -829,9 +829,9 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, | |||
829 | } | 829 | } |
830 | if (emu->audigy) { | 830 | if (emu->audigy) { |
831 | /* set master volume to 0 dB */ | 831 | /* set master volume to 0 dB */ |
832 | snd_ac97_write(emu->ac97, AC97_MASTER, 0x0000); | 832 | snd_ac97_write_cache(emu->ac97, AC97_MASTER, 0x0000); |
833 | /* set capture source to mic */ | 833 | /* set capture source to mic */ |
834 | snd_ac97_write(emu->ac97, AC97_REC_SEL, 0x0000); | 834 | snd_ac97_write_cache(emu->ac97, AC97_REC_SEL, 0x0000); |
835 | c = audigy_remove_ctls; | 835 | c = audigy_remove_ctls; |
836 | } else { | 836 | } else { |
837 | /* | 837 | /* |
@@ -844,8 +844,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, | |||
844 | snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT); | 844 | snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT); |
845 | } | 845 | } |
846 | /* remove unused AC97 controls */ | 846 | /* remove unused AC97 controls */ |
847 | snd_ac97_write(emu->ac97, AC97_SURROUND_MASTER, 0x0202); | 847 | snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202); |
848 | snd_ac97_write(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202); | 848 | snd_ac97_write_cache(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202); |
849 | c = emu10k1_remove_ctls; | 849 | c = emu10k1_remove_ctls; |
850 | } | 850 | } |
851 | for (; *c; c++) | 851 | for (; *c; c++) |