From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 20 Jun 2011 12:09:02 +0000 (+0200)
Subject: ALSA: hda - Name the primary out as Speaker when needed for VIA codecs
X-Git-Tag: MMI-PSA29.97-13-9~18103^2~124^2~69^2~15
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6aadf41d6b9f8da68db5962929c07f816db15893;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

ALSA: hda - Name the primary out as Speaker when needed for VIA codecs

When the primary output is the speaker output, rather name it as
"Speaker".  This will be more intuitive.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
---

diff --git a/sound/pci/hda/patch_via.c b/sound/pci/hda/patch_via.c
index bd6ffa602f22..6e621b7c984e 100644
--- a/sound/pci/hda/patch_via.c
+++ b/sound/pci/hda/patch_via.c
@@ -1770,7 +1770,11 @@ static int via_auto_create_multi_out_ctls(struct hda_codec *codec)
 			if (err < 0)
 				return err;
 		} else {
-			err = create_ch_ctls(codec, chname[i], pin, dac, 3);
+			const char *pfx = chname[i];
+			if (cfg->line_out_type == AUTO_PIN_SPEAKER_OUT &&
+			    cfg->line_outs == 1)
+				pfx = "Speaker";
+			err = create_ch_ctls(codec, pfx, pin, dac, 3);
 			if (err < 0)
 				return err;
 		}