From 71e895772cd8064f52a15f7afb20d7e69c537caa Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Mon, 30 Aug 2010 13:05:08 +0200 Subject: [PATCH] --- yaml --- r: 216665 b: refs/heads/master c: fa4968a8b231816d161583e604a9f972e5713f17 h: refs/heads/master i: 216663: 0093e63f5ae474014a82bed12b26b4850ba08b6d v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/patch_ca0110.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 88d360749bec..5d6fe7aaaa37 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9e042e71325eeda03636aedfde6f2d27d6332188 +refs/heads/master: fa4968a8b231816d161583e604a9f972e5713f17 diff --git a/trunk/sound/pci/hda/patch_ca0110.c b/trunk/sound/pci/hda/patch_ca0110.c index af478019088e..42b3fb4cafc4 100644 --- a/trunk/sound/pci/hda/patch_ca0110.c +++ b/trunk/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++; }