diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-10-25 10:40:05 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-10-25 10:40:05 +0200 |
| commit | 506ecbca71d07fa327dd986be1682e90885678ee (patch) | |
| tree | eba675a57b0201c8f30436d08cab03c5dcd235ba /sound/pci/hda/patch_ca0110.c | |
| parent | aa5c14d5c0d3e4c587db4a1b220b9c86415c538f (diff) | |
| parent | 0e7adbe263f89ea2ef15b5af5e80a812b2a85025 (diff) | |
| download | kernel_samsung_crespo-506ecbca71d07fa327dd986be1682e90885678ee.zip kernel_samsung_crespo-506ecbca71d07fa327dd986be1682e90885678ee.tar.gz kernel_samsung_crespo-506ecbca71d07fa327dd986be1682e90885678ee.tar.bz2 | |
Merge branch 'topic/hda' into for-linus
Diffstat (limited to 'sound/pci/hda/patch_ca0110.c')
| -rw-r--r-- | sound/pci/hda/patch_ca0110.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c index af47801..46c8bf4 100644 --- a/sound/pci/hda/patch_ca0110.c +++ b/sound/pci/hda/patch_ca0110.c @@ -468,13 +468,13 @@ 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] = hda_get_input_pin_label(codec, pin, 1); spec->adcs[n] = nid; n++; } @@ -489,7 +489,7 @@ static void parse_digital(struct hda_codec *codec) if (cfg->dig_outs && snd_hda_get_connections(codec, cfg->dig_out_pins[0], &spec->dig_out, 1) == 1) - spec->multiout.dig_out_nid = cfg->dig_out_pins[0]; + spec->multiout.dig_out_nid = spec->dig_out; } static int ca0110_parse_auto_config(struct hda_codec *codec) |