From: David Henningsson <david.henningsson@canonical.com>
Date: Thu, 16 Oct 2014 13:33:46 +0000 (+0200)
Subject: ALSA: hda - Use "Line Out" name instead of "PCM" when there are other outputs
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=3abb4f4d0e7aaad0d12004b5057f4486a688752b;p=deliverable%2Flinux.git

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>
---

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,
 
 	/* for a single channel output, we don't have to name the channel */
 	if (cfg->line_outs == 1 && !spec->multi_ios)
-		return "PCM";
+		return "Line Out";
 
 	if (ch >= ARRAY_SIZE(channel_name)) {
 		snd_BUG();