]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
ALSA: hda - Don't create duplicated ctls for loopback paths
authorTakashi Iwai <tiwai@suse.de>
Tue, 7 Jan 2014 17:11:44 +0000 (18:11 +0100)
committerTakashi Iwai <tiwai@suse.de>
Wed, 8 Jan 2014 08:59:41 +0000 (09:59 +0100)
AD1986A mic pins (0x1d and 0x1f) share the same widget for controlling
the loopback volume/mute, but the generic parser didn't check it.
This ended up with the duplicated controls for the same effect.

This patch adds the check of the duplication for avoiding it.

After this fix, there will be only one control although it affects
both paths; this remaining issue should be fixed later in a different
patch.

Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=66621
Cc: <stable@vger.kernel.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
sound/pci/hda/hda_generic.c

index ce004326d54bd86ea20f9cad25214cb91fc9e972..7513089c8985ca97bcbf81de911b6bfd7420bfd0 100644 (file)
@@ -2858,9 +2858,11 @@ static bool look_for_mix_leaf_ctls(struct hda_codec *codec, hda_nid_t mix_nid,
        if (num_conns < idx)
                return false;
        nid = list[idx];
-       if (!*mix_val && nid_has_volume(codec, nid, HDA_OUTPUT))
+       if (!*mix_val && nid_has_volume(codec, nid, HDA_OUTPUT) &&
+           !is_ctl_associated(codec, nid, HDA_OUTPUT, 0, NID_PATH_VOL_CTL))
                *mix_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
-       if (!*mute_val && nid_has_mute(codec, nid, HDA_OUTPUT))
+       if (!*mute_val && nid_has_mute(codec, nid, HDA_OUTPUT) &&
+           !is_ctl_associated(codec, nid, HDA_OUTPUT, 0, NID_PATH_MUTE_CTL))
                *mute_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT);
 
        return *mix_val || *mute_val;