ALSA: hda - Fix missing mute controls for CX5051
We've added a fake mute control (setting the amp volume to zero) for CX5051 at commit [3868137e: ALSA: hda - Add a fake mute feature], but this feature was overlooked in the generic parser implementation. Now the driver lacks of mute controls on these codecs. The fix is just to check both AC_AMPCAP_MUTE and AC_AMPCAP_MIN_MUTE bits in each place checking the amp capabilities. Bugzilla: https://bugzilla.kernel.org/show_bug.cgi?id=59001 Cc: <stable@vger.kernel.org> [v3.9+] Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Родитель
aa773bfe8f
Коммит
f69910ddbd
|
@ -522,7 +522,7 @@ static bool same_amp_caps(struct hda_codec *codec, hda_nid_t nid1,
|
|||
}
|
||||
|
||||
#define nid_has_mute(codec, nid, dir) \
|
||||
check_amp_caps(codec, nid, dir, AC_AMPCAP_MUTE)
|
||||
check_amp_caps(codec, nid, dir, (AC_AMPCAP_MUTE | AC_AMPCAP_MIN_MUTE))
|
||||
#define nid_has_volume(codec, nid, dir) \
|
||||
check_amp_caps(codec, nid, dir, AC_AMPCAP_NUM_STEPS)
|
||||
|
||||
|
@ -624,7 +624,7 @@ static int get_amp_val_to_activate(struct hda_codec *codec, hda_nid_t nid,
|
|||
if (enable)
|
||||
val = (caps & AC_AMPCAP_OFFSET) >> AC_AMPCAP_OFFSET_SHIFT;
|
||||
}
|
||||
if (caps & AC_AMPCAP_MUTE) {
|
||||
if (caps & (AC_AMPCAP_MUTE | AC_AMPCAP_MIN_MUTE)) {
|
||||
if (!enable)
|
||||
val |= HDA_AMP_MUTE;
|
||||
}
|
||||
|
@ -648,7 +648,7 @@ static unsigned int get_amp_mask_to_modify(struct hda_codec *codec,
|
|||
{
|
||||
unsigned int mask = 0xff;
|
||||
|
||||
if (caps & AC_AMPCAP_MUTE) {
|
||||
if (caps & (AC_AMPCAP_MUTE | AC_AMPCAP_MIN_MUTE)) {
|
||||
if (is_ctl_associated(codec, nid, dir, idx, NID_PATH_MUTE_CTL))
|
||||
mask &= ~0x80;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче