Commit 265a0247 authored by Takashi Iwai's avatar Takashi Iwai

ALSA: hda - Check invalid NIDs in alc_init_jacks()

The headphone and external-mic pin NIDs can be null, and the jack input
elements should be skipped in such a case.
Signed-off-by: default avatarTakashi Iwai <tiwai@suse.de>
parent 9e5341b9
...@@ -1087,15 +1087,19 @@ static int alc_init_jacks(struct hda_codec *codec) ...@@ -1087,15 +1087,19 @@ static int alc_init_jacks(struct hda_codec *codec)
unsigned int hp_nid = spec->autocfg.hp_pins[0]; unsigned int hp_nid = spec->autocfg.hp_pins[0];
unsigned int mic_nid = spec->ext_mic.pin; unsigned int mic_nid = spec->ext_mic.pin;
err = alc_add_jack(codec, hp_nid, SND_JACK_HEADPHONE); if (hp_nid) {
if (err < 0) err = alc_add_jack(codec, hp_nid, SND_JACK_HEADPHONE);
return err; if (err < 0)
alc_report_jack(codec, hp_nid); return err;
alc_report_jack(codec, hp_nid);
}
err = alc_add_jack(codec, mic_nid, SND_JACK_MICROPHONE); if (mic_nid) {
if (err < 0) err = alc_add_jack(codec, mic_nid, SND_JACK_MICROPHONE);
return err; if (err < 0)
alc_report_jack(codec, mic_nid); return err;
alc_report_jack(codec, mic_nid);
}
return 0; return 0;
} }
......
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