From 91a5e760f7564a39716b39409876ffafd57c8ef3 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Wed, 15 Mar 2006 13:52:54 +0100
Subject: [PATCH] --- yaml --- r: 22782 b: refs/heads/master c:
 7c5706bb33687ce82f30d9ac06dd1bdf71b2262e h: refs/heads/master v: v3

---
 [refs]                            |  2 +-
 trunk/include/sound/ac97_codec.h  | 13 +++++++------
 trunk/sound/pci/ac97/ac97_codec.c |  1 +
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 669fcad69e32..213e2ea4f821 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4ccb4a4387b3ed8c5a03862ef1e6f7be484ade25
+refs/heads/master: 7c5706bb33687ce82f30d9ac06dd1bdf71b2262e
diff --git a/trunk/include/sound/ac97_codec.h b/trunk/include/sound/ac97_codec.h
index 9036d25e1bac..dee766c17e9c 100644
--- a/trunk/include/sound/ac97_codec.h
+++ b/trunk/include/sound/ac97_codec.h
@@ -433,6 +433,12 @@ struct snd_ac97_bus {
 	struct snd_info_entry *proc;
 };
 
+/* static resolution table */
+struct snd_ac97_res_table {
+	unsigned short reg;	/* register */
+	unsigned short bits;	/* resolution bitmask */
+};
+
 struct snd_ac97_template {
 	void *private_data;
 	void (*private_free) (struct snd_ac97 *ac97);
@@ -442,12 +448,7 @@ struct snd_ac97_template {
 	unsigned int scaps;	/* driver capabilities */
 	unsigned int limited_regs; /* allow limited registers only */
 	DECLARE_BITMAP(reg_accessed, 0x80); /* bit flags */
-};
-
-/* static resolution table */
-struct snd_ac97_res_table {
-	unsigned short reg;	/* register */
-	unsigned short bits;	/* resolution bitmask */
+	const struct snd_ac97_res_table *res_table;	/* static resolution */
 };
 
 struct snd_ac97 {
diff --git a/trunk/sound/pci/ac97/ac97_codec.c b/trunk/sound/pci/ac97/ac97_codec.c
index 38b6c65d40c3..c5bbdcbf5422 100644
--- a/trunk/sound/pci/ac97/ac97_codec.c
+++ b/trunk/sound/pci/ac97/ac97_codec.c
@@ -1868,6 +1868,7 @@ int snd_ac97_mixer(struct snd_ac97_bus *bus, struct snd_ac97_template *template,
 	ac97->scaps = template->scaps;
 	ac97->limited_regs = template->limited_regs;
 	memcpy(ac97->reg_accessed, template->reg_accessed, sizeof(ac97->reg_accessed));
+	ac97->res_table = template->res_table;
 	bus->codec[ac97->num] = ac97;
 	mutex_init(&ac97->reg_mutex);
 	mutex_init(&ac97->page_mutex);