Commit fbe618f2 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Don't check capture source mixer if no ADC is available

With multiple codec configurations, some codec might have no ADC, thus
it keeps spec->adc_nids = NULL.  This causes an Oops in alc_build_controls().

Reference: kernel bug #16156
	https://bugzilla.kernel.org/show_bug.cgi?id=16156

Cc: <stable@kernel.org>
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent ab669967
...@@ -2619,6 +2619,7 @@ static int alc_build_controls(struct hda_codec *codec) ...@@ -2619,6 +2619,7 @@ static int alc_build_controls(struct hda_codec *codec)
} }
/* assign Capture Source enums to NID */ /* assign Capture Source enums to NID */
if (spec->capsrc_nids || spec->adc_nids) {
kctl = snd_hda_find_mixer_ctl(codec, "Capture Source"); kctl = snd_hda_find_mixer_ctl(codec, "Capture Source");
if (!kctl) if (!kctl)
kctl = snd_hda_find_mixer_ctl(codec, "Input Source"); kctl = snd_hda_find_mixer_ctl(codec, "Input Source");
...@@ -2630,6 +2631,7 @@ static int alc_build_controls(struct hda_codec *codec) ...@@ -2630,6 +2631,7 @@ static int alc_build_controls(struct hda_codec *codec)
if (err < 0) if (err < 0)
return err; return err;
} }
}
if (spec->cap_mixer) { if (spec->cap_mixer) {
const char *kname = kctl ? kctl->id.name : NULL; const char *kname = kctl ? kctl->id.name : NULL;
for (knew = spec->cap_mixer; knew->name; knew++) { for (knew = spec->cap_mixer; knew->name; knew++) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment