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++;
 	}