diff options
| -rw-r--r-- | sound/pci/hda/hda_generic.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index ce004326d54b..7513089c8985 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c | |||
| @@ -2858,9 +2858,11 @@ static bool look_for_mix_leaf_ctls(struct hda_codec *codec, hda_nid_t mix_nid, | |||
| 2858 | if (num_conns < idx) | 2858 | if (num_conns < idx) |
| 2859 | return false; | 2859 | return false; |
| 2860 | nid = list[idx]; | 2860 | nid = list[idx]; |
| 2861 | if (!*mix_val && nid_has_volume(codec, nid, HDA_OUTPUT)) | 2861 | if (!*mix_val && nid_has_volume(codec, nid, HDA_OUTPUT) && |
| 2862 | !is_ctl_associated(codec, nid, HDA_OUTPUT, 0, NID_PATH_VOL_CTL)) | ||
| 2862 | *mix_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT); | 2863 | *mix_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT); |
| 2863 | if (!*mute_val && nid_has_mute(codec, nid, HDA_OUTPUT)) | 2864 | if (!*mute_val && nid_has_mute(codec, nid, HDA_OUTPUT) && |
| 2865 | !is_ctl_associated(codec, nid, HDA_OUTPUT, 0, NID_PATH_MUTE_CTL)) | ||
| 2864 | *mute_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT); | 2866 | *mute_val = HDA_COMPOSE_AMP_VAL(nid, 3, 0, HDA_OUTPUT); |
| 2865 | 2867 | ||
| 2866 | return *mix_val || *mute_val; | 2868 | return *mix_val || *mute_val; |