Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4d7d7596 authored by Takashi Iwai's avatar Takashi Iwai Committed by Jaroslav Kysela
Browse files

[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: default avatarTakashi Iwai <tiwai@suse.de>
parent 59b1b34f

sound/pci/emu10k1/emumixer.c

+4 −4
Original line number Diff line number Diff line
@@ -829,9 +829,9 @@ int __devinit snd_emu10k1_mixer(struct snd_emu10k1 *emu, 
		}

		if (emu->audigy) {

			/* 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 */

			snd_ac97_write(emu->ac97, AC97_REC_SEL, 0x0000);

			snd_ac97_write_cache(emu->ac97, AC97_REC_SEL, 0x0000);

			c = audigy_remove_ctls;

		} 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);

			}

			/* remove unused AC97 controls */

			snd_ac97_write(emu->ac97, AC97_SURROUND_MASTER, 0x0202);

			snd_ac97_write(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202);

			snd_ac97_write_cache(emu->ac97, AC97_SURROUND_MASTER, 0x0202);

			snd_ac97_write_cache(emu->ac97, AC97_CENTER_LFE_MASTER, 0x0202);

			c = emu10k1_remove_ctls;

		}

		for (; *c; c++)