2 files changed, 19 insertions, 0 deletions

diff --git a/include/sound/ac97_codec.h b/include/sound/ac97_codec.h
index ad3fe046f6cf..9036d25e1bac 100644
--- a/include/sound/ac97_codec.h
+++ b/include/sound/ac97_codec.h
@@ -444,6 +444,12 @@ struct snd_ac97_template {
         DECLARE_BITMAP(reg_accessed, 0x80); /* bit flags */
 };
 
+/* static resolution table */
+struct snd_ac97_res_table {
+        unsigned short reg;     /* register */
+        unsigned short bits;    /* resolution bitmask */
+};
+
 struct snd_ac97 {
         /* -- lowlevel (hardware) driver specific -- */
         struct snd_ac97_build_ops * build_ops;
@@ -464,6 +470,7 @@ struct snd_ac97 {
         unsigned short caps;    /* capabilities (register 0) */
         unsigned short ext_id;  /* extended feature identification (register 28) */
         unsigned short ext_mid; /* extended modem ID (register 3C) */
+        const struct snd_ac97_res_table *res_table;     /* static resolution */
         unsigned int scaps;     /* driver capabilities */
         unsigned int flags;     /* specific code */
         unsigned int rates[6];  /* see AC97_RATES_* defines */
diff --git a/sound/pci/ac97/ac97_codec.c b/sound/pci/ac97/ac97_codec.c
index 6108cdc5efb6..124c1bc4cb92 100644
--- a/sound/pci/ac97/ac97_codec.c
+++ b/sound/pci/ac97/ac97_codec.c
@@ -1030,6 +1030,18 @@ static void check_volume_resolution(struct snd_ac97 *ac97, int reg, unsigned cha
         unsigned char max[3] = { 63, 31, 15 };
         int i;
 
+        /* first look up the static resolution table */
+        if (ac97->res_table) {
+                const struct snd_ac97_res_table *tbl;
+                for (tbl = ac97->res_table; tbl->reg; tbl++) {
+                        if (tbl->reg == reg) {
+                                *lo_max = tbl->bits & 0xff;
+                                *hi_max = (tbl->bits >> 8) & 0xff;
+                                return;
+                        }
+                }
+        }
+
         *lo_max = *hi_max = 0;
         for (i = 0 ; i < ARRAY_SIZE(cbit); i++) {
                 unsigned short val;