aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2010-08-30 07:05:08 -0400
committerTakashi Iwai <tiwai@suse.de>2010-08-30 07:05:08 -0400
commitfa4968a8b231816d161583e604a9f972e5713f17 (patch)
tree47749b2423ac56e4b1fbb9edf616cfe6c8d4bb8c /sound/pci
parent9e042e71325eeda03636aedfde6f2d27d6332188 (diff)
ALSA: hda - Use new inputs[] field to parse input-pins for CA-IBG codecs
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r--sound/pci/hda/patch_ca0110.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c
index af478019088e..42b3fb4cafc4 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)
468 spec->dig_in = nid; 468 spec->dig_in = nid;
469 continue; 469 continue;
470 } 470 }
471 for (j = 0; j < AUTO_PIN_LAST; j++) 471 for (j = 0; j < cfg->num_inputs; j++)
472 if (cfg->input_pins[j] == pin) 472 if (cfg->inputs[j].pin == pin)
473 break; 473 break;
474 if (j >= AUTO_PIN_LAST) 474 if (j >= cfg->num_inputs)
475 continue; 475 continue;
476 spec->input_pins[n] = pin; 476 spec->input_pins[n] = pin;
477 spec->input_labels[n] = auto_pin_cfg_labels[j]; 477 spec->input_labels[n] =
478 auto_pin_cfg_labels[cfg->inputs[j].type];
478 spec->adcs[n] = nid; 479 spec->adcs[n] = nid;
479 n++; 480 n++;
480 } 481 }