From 92d6bc915f8fe276b9695426ad4065b8ae6c022d Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Wed, 19 Dec 2012 17:41:52 +0100 Subject: [PATCH] --- yaml --- r: 353048 b: refs/heads/master c: 624d914d091a5eebb4d648bd6b4ae6481171ae5c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_generic.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index c322bd95ff58..e51a5acfc3b8 100644 --- 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 index 6914d70df09a..f8d1d03cd219 100644 --- 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;