From: Takashi Iwai Date: Wed, 24 Aug 2011 15:27:52 +0000 (+0200) Subject: ALSA: hda - Fix Center/LFE mixer element creations for Realtek X-Git-Tag: MMI-PSA29.97-13-9~18103^2~61 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=9c4e84d3b8cbcde88947ceff265e11d38ab127b9;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git ALSA: hda - Fix Center/LFE mixer element creations for Realtek The commit 23c09b00900c3fa6672148738cad29d6fc6ded7c ALSA: hda - Support multiple speakers by Realtek auto-parser changes the return value from alc_get_line_out_pfx(), and it breaks the center/LFE mixer split check. The caller must test with a string "CLFE" now. Signed-off-by: Takashi Iwai --- diff --git a/sound/pci/hda/patch_realtek.c b/sound/pci/hda/patch_realtek.c index 50fd55097488..de63619decdb 100644 --- a/sound/pci/hda/patch_realtek.c +++ b/sound/pci/hda/patch_realtek.c @@ -3014,7 +3014,7 @@ static int alc_auto_create_multi_out_ctls(struct hda_codec *codec, sw = alc_look_for_out_mute_nid(codec, pin, dac); vol = alc_look_for_out_vol_nid(codec, pin, dac); name = alc_get_line_out_pfx(spec, i, true, &index); - if (!name) { + if (!name || !strcmp(name, "CLFE")) { /* Center/LFE */ err = alc_auto_add_vol_ctl(codec, "Center", 0, vol, 1); if (err < 0)