ALSA: hda - Fix Center/LFE mixer element creations for Realtek
authorTakashi Iwai <tiwai@suse.de>
Wed, 24 Aug 2011 15:27:52 +0000 (17:27 +0200)
committerTakashi Iwai <tiwai@suse.de>
Wed, 24 Aug 2011 15:27:52 +0000 (17:27 +0200)
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 <tiwai@suse.de>
sound/pci/hda/patch_realtek.c

index 50fd550974880a065310776616bace5adaeb513e..de63619decdb1e2f1f29e80b2aadac0bd04e3e65 100644 (file)
@@ -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)