aboutsummaryrefslogtreecommitdiffstats
path: root/sound/pci/hda
diff options
context:
space:
mode:
authorDavid Henningsson <david.henningsson@canonical.com>2014-10-16 09:33:46 -0400
committerTakashi Iwai <tiwai@suse.de>2014-10-20 07:38:10 -0400
commit3abb4f4d0e7aaad0d12004b5057f4486a688752b (patch)
tree8899cb8a70422328a9fa03c27d771341d99b5336 /sound/pci/hda
parent03ad6a8c93b6df2d65c305b5b5f9474068b45bfb (diff)
ALSA: hda - Use "Line Out" name instead of "PCM" when there are other outputs
In case there are speakers or headphones as well, anything that only covers the line out should not be labelled "PCM". Let's name it "Line Out" instead for clarity. Signed-off-by: David Henningsson <david.henningsson@canonical.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci/hda')
-rw-r--r--sound/pci/hda/hda_generic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c
index dc13cce70932..06d721085e72 100644
--- a/sound/pci/hda/hda_generic.c
+++ b/sound/pci/hda/hda_generic.c
@@ -1055,7 +1055,7 @@ static const char *get_line_out_pfx(struct hda_codec *codec, int ch,
1055 1055
1056 /* for a single channel output, we don't have to name the channel */ 1056 /* for a single channel output, we don't have to name the channel */
1057 if (cfg->line_outs == 1 && !spec->multi_ios) 1057 if (cfg->line_outs == 1 && !spec->multi_ios)
1058 return "PCM"; 1058 return "Line Out";
1059 1059
1060 if (ch >= ARRAY_SIZE(channel_name)) { 1060 if (ch >= ARRAY_SIZE(channel_name)) {
1061 snd_BUG(); 1061 snd_BUG();