From 0966efa9631b9c5c851e7368c4432ae87735e621 Mon Sep 17 00:00:00 2001
From: Sasha Khapyorsky <sashak@smlink.com>
Date: Thu, 7 Apr 2005 20:23:58 +0200
Subject: [PATCH] --- yaml --- r: 1493 b: refs/heads/master c:
 23fea4dad67a665e8d359dbb39180422385f1dcc h: refs/heads/master i:   1491:
 927d3ea3bf7605977f7ce7569591a715bbc79e1b v: v3

---
 [refs]                            | 2 +-
 trunk/sound/pci/ac97/ac97_codec.c | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c3124d18bbc4..bc836becdd41 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e8311b0ac4dc8a2cf317e122a6f7dc4467e3254
+refs/heads/master: 23fea4dad67a665e8d359dbb39180422385f1dcc
diff --git a/trunk/sound/pci/ac97/ac97_codec.c b/trunk/sound/pci/ac97/ac97_codec.c
index ab7114c51dcb..1ad7f83a65e1 100644
--- a/trunk/sound/pci/ac97/ac97_codec.c
+++ b/trunk/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 {