diff options
author | David Henningsson <david.henningsson@canonical.com> | 2013-01-16 15:58:43 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2013-01-16 16:22:43 +0100 |
commit | 02aba550537a666b8d09346f39d6372c78b115a5 (patch) | |
tree | d017a8bfc4aacf6a8865da0eacf700e2fe098357 /sound/pci | |
parent | c0f3b21643487e2bbf8af534a33ffd2857e18fa1 (diff) | |
download | op-kernel-dev-02aba550537a666b8d09346f39d6372c78b115a5.zip op-kernel-dev-02aba550537a666b8d09346f39d6372c78b115a5.tar.gz |
ALSA: hda - do not add non-existing Mic boost controls
If the input node does not have any volume capable input amp,
don't add such a control.
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'sound/pci')
-rw-r--r-- | sound/pci/hda/hda_generic.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sound/pci/hda/hda_generic.c b/sound/pci/hda/hda_generic.c index c33e019..05dfeb7 100644 --- a/sound/pci/hda/hda_generic.c +++ b/sound/pci/hda/hda_generic.c @@ -2826,6 +2826,9 @@ static int parse_mic_boost(struct hda_codec *codec) struct nid_path *path; unsigned int val; + if (!nid_has_volume(codec, nid, HDA_INPUT)) + continue; + label = hda_get_autocfg_input_label(codec, cfg, i); if (prev_label && !strcmp(label, prev_label)) type_idx++; |