ALSA: HDA: Fix volume control naming for surround speakers on Realtek auto-parser
authorDavid Henningsson <david.henningsson@canonical.com>
Fri, 4 Mar 2011 13:08:30 +0000 (14:08 +0100)
committerTakashi Iwai <tiwai@suse.de>
Thu, 10 Mar 2011 16:35:01 +0000 (17:35 +0100)
When more than one pair of internal speakers is present, allow names
according to their channels.

Tested-by: Bartłomiej Żogała <nusch88@gmail.com>
Cc: <stable@kernel.org>
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/patch_realtek.c

index b4a22dd775a22ae21e64912ac3592e953f960efd..6f59bccb104c18959c076ee1418af50ae925e7b4 100644 (file)
@@ -5080,7 +5080,9 @@ static const char *alc_get_line_out_pfx(const struct auto_pin_cfg *cfg,
 
        switch (cfg->line_out_type) {
        case AUTO_PIN_SPEAKER_OUT:
-               return "Speaker";
+               if (cfg->line_outs == 1)
+                       return "Speaker";
+               break;
        case AUTO_PIN_HP_OUT:
                return "Headphone";
        default: