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 bd6ffa602f2250fcc8d89a0eac229a6f8a3caa65..6e621b7c984ec1f7423a14bbe76cfea26221c885 100644 (file)
--- 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;
                }