diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-08-30 13:05:08 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-08-30 13:05:08 +0200 |
| commit | fa4968a8b231816d161583e604a9f972e5713f17 (patch) | |
| tree | 47749b2423ac56e4b1fbb9edf616cfe6c8d4bb8c | |
| parent | 9e042e71325eeda03636aedfde6f2d27d6332188 (diff) | |
| download | op-kernel-dev-fa4968a8b231816d161583e604a9f972e5713f17.zip op-kernel-dev-fa4968a8b231816d161583e604a9f972e5713f17.tar.gz | |
ALSA: hda - Use new inputs[] field to parse input-pins for CA-IBG codecs
Signed-off-by: Takashi Iwai <tiwai@suse.de>
| -rw-r--r-- | sound/pci/hda/patch_ca0110.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c index af47801..42b3fb4 100644 --- a/sound/pci/hda/patch_ca0110.c +++ b/sound/pci/hda/patch_ca0110.c @@ -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++; } |
