mirrors/linux
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-05-04 15:09:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

ALSA: hda/realtek - Check amp capabilities of aa-mixer widget

Browse Source 
For handling the analog-loopback paths more generically, check the amp
capabilities of the aa-mixer widget, and create only the appropriate
mixer elements.

Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
Takashi Iwai
2012-12-12 18:08:52 +01:00
parent c2fd19c2fc
commit bd32f782b9
1 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sound/pci/hda/patch_realtek.c
View File

@@ -2672,6 +2672,10 @@ static int new_analog_input(struct hda_codec *codec, hda_nid_t pin,
struct nid_path *path;
int err, idx;
if (!nid_has_volume(codec, mix_nid, HDA_INPUT) &&
!nid_has_mute(codec, mix_nid, HDA_INPUT))
return 0; /* no need for analog loopback */
path = snd_array_new(&spec->loopback_path);
if (!path)
return -ENOMEM;
@@ -2680,14 +2684,20 @@ static int new_analog_input(struct hda_codec *codec, hda_nid_t pin,
return -EINVAL;
idx = path->idx[path->depth - 1];
err = __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, ctlname, ctlidx,
if (nid_has_volume(codec, mix_nid, HDA_INPUT)) {
err = __add_pb_vol_ctrl(spec, ALC_CTL_WIDGET_VOL, ctlname, ctlidx,
HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
if (err < 0)
return err;
err = __add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname, ctlidx,
if (err < 0)
return err;
}
if (nid_has_mute(codec, mix_nid, HDA_INPUT)) {
err = __add_pb_sw_ctrl(spec, ALC_CTL_WIDGET_MUTE, ctlname, ctlidx,
HDA_COMPOSE_AMP_VAL(mix_nid, 3, idx, HDA_INPUT));
if (err < 0)
return err;
if (err < 0)
return err;
}
add_loopback_list(spec, mix_nid, idx);
return 0;
}