From: Sasha Khapyorsky <sashak@smlink.com>
Date: Thu, 7 Apr 2005 18:23:58 +0000 (+0200)
Subject: [ALSA] MC97 registers reset
X-Git-Tag: v2.6.13-rc1~68^2~705
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;ds=sidebyside;h=23fea4dad67a665e8d359dbb39180422385f1dcc;p=powerpc.git

[ALSA] MC97 registers reset

AC97 Codec
Separated ac97 registers reset for audio and modem (or both) as recommended
in AC97 spec.

Signed-off-by: Sasha Khapyorsky <sashak@smlink.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index ab7114c51d..1ad7f83a65 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1872,7 +1872,11 @@ int snd_ac97_mixer(ac97_bus_t *bus, ac97_template_t *template, ac97_t **rac97)
 			goto __access_ok;
 	}
 
-	snd_ac97_write(ac97, AC97_RESET, 0);	/* reset to defaults */
+	/* reset to defaults */
+	if (!(ac97->scaps & AC97_SCAP_SKIP_AUDIO))
+		snd_ac97_write(ac97, AC97_RESET, 0);
+	if (!(ac97->scaps & AC97_SCAP_SKIP_MODEM))
+		snd_ac97_write(ac97, AC97_EXTENDED_MID, 0);
 	if (bus->ops->wait)
 		bus->ops->wait(ac97);
 	else {