]> bbs.cooldavid.org Git - net-next-2.6.git/commitdiff
ALSA: hda - Use new inputs[] field to parse input-pins for CA-IBG codecs
authorTakashi Iwai <tiwai@suse.de>
Mon, 30 Aug 2010 11:05:08 +0000 (13:05 +0200)
committerTakashi Iwai <tiwai@suse.de>
Mon, 30 Aug 2010 11:05:08 +0000 (13:05 +0200)
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_ca0110.c

index af478019088eea787528f115df7a5f7e4270f701..42b3fb4cafc4392066f2d89a82876db0d08db70e 100644 (file)
@@ -468,13 +468,14 @@ static void parse_input(struct hda_codec *codec)
                        spec->dig_in = nid;
                        continue;
                }
-               for (j = 0; j < AUTO_PIN_LAST; j++)
-                       if (cfg->input_pins[j] == pin)
+               for (j = 0; j < cfg->num_inputs; j++)
+                       if (cfg->inputs[j].pin == pin)
                                break;
-               if (j >= AUTO_PIN_LAST)
+               if (j >= cfg->num_inputs)
                        continue;
                spec->input_pins[n] = pin;
-               spec->input_labels[n] = auto_pin_cfg_labels[j];
+               spec->input_labels[n] =
+                       auto_pin_cfg_labels[cfg->inputs[j].type];
                spec->adcs[n] = nid;
                n++;
        }