lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ALSA] emu10k1 - Fix silence problems after suspend

Browse Source 
Modules: EMU10K1/EMU10K2 driver

Fix silence problems on some boards after suspend/resume (bug#1674).

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2006-01-04 16:00:48 +01:00
committed by Jaroslav Kysela
parent 59b1b34f47
commit 4d7d759628
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sound/pci/emu10k1/emumixer.c
View File

@@ -829,9 +829,9 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
} }
if (emu->audigy) { if (emu->audigy) {
/* set master volume to 0 dB */ /* set master volume to 0 dB */
snd_ac97_write(emu->ac97, AC97_MASTER, 0x0000); snd_ac97_write_cache(emu->ac97, AC97_MASTER, 0x0000);
/* set capture source to mic */ /* set capture source to mic */
snd_ac97_write(emu->ac97, AC97_REC_SEL, 0x0000); snd_ac97_write_cache(emu->ac97, AC97_REC_SEL, 0x0000);
c = audigy_remove_ctls; c = audigy_remove_ctls;
} else { } else {
/* /*
@@ -844,8 +844,8 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu,
snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT); snd_emu10k1_ptr_write(emu, AC97SLOT, 0, AC97SLOT_CNTR|AC97SLOT_LFE|AC97SLOT_REAR_LEFT|AC97SLOT_REAR_RIGHT);
} }
/* remove unused AC97 controls */ /* remove unused AC97 controls */
snd_ac97_write(emu->ac97, AC97_SURROUND_MASTER, 0x0202); snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202);
snd_ac97_write(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202); snd_ac97_write_cache(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202);
c = emu10k1_remove_ctls; c = emu10k1_remove_ctls;
} }
for (; *c; c++) for (; *c; c++)