---

yaml --- r: 353048 b: refs/heads/master c: 624d914 h: refs/heads/master v: v3
git-mirror · Jan 12, 2013 · 92d6bc9 · 92d6bc9
1 parent 12a0f0b
commit 92d6bc9
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 08c189f2c5523eda847cddb89eb8f44c0b957431
+refs/heads/master: 624d914d091a5eebb4d648bd6b4ae6481171ae5c
diff --git a/trunk/sound/pci/hda/hda_generic.c b/trunk/sound/pci/hda/hda_generic.c
@@ -2172,7 +2172,9 @@ static int create_capture_mixers(struct hda_codec *codec)
 
 	if (!spec->auto_mic && imux->num_items > 1) {
 		struct snd_kcontrol_new *knew;
-		knew = snd_hda_gen_add_kctl(spec, NULL, &cap_src_temp);
+		const char *name;
+		name = nums > 1 ? "Input Source" : "Capture Source";
+		knew = snd_hda_gen_add_kctl(spec, name, &cap_src_temp);
 		if (!knew)
 			return -ENOMEM;
 		knew->count = nums;