1 files changed, 5 insertions, 5 deletions

diff --git a/sound/pci/hda/patch_ca0110.c b/sound/pci/hda/patch_ca0110.c
index af478019088e..46c8bf48c31f 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)