ALSA: hda/jack - Fix NULL-dereference at probing
At probing time, the elements that aren't assigned to kctl or jack may be called. Need proper NULL-checks. Signed-off-by: Takashi Iwai <tiwai@suse.de>
This commit is contained in:
parent
d1cb620081
commit
cfc7c9d307
1 changed files with 3 additions and 1 deletions
|
@ -194,6 +194,8 @@ void snd_hda_jack_report_sync(struct hda_codec *codec)
|
|||
for (i = 0; i < codec->jacktbl.used; i++, jack++)
|
||||
if (jack->nid) {
|
||||
jack_detect_update(codec, jack);
|
||||
if (!jack->kctl)
|
||||
continue;
|
||||
state = get_jack_plug_state(jack->pin_sense);
|
||||
snd_kctl_jack_report(codec->bus->card, jack->kctl, state);
|
||||
}
|
||||
|
@ -356,7 +358,7 @@ void snd_hda_input_jack_report(struct hda_codec *codec, hda_nid_t nid)
|
|||
unsigned int present;
|
||||
int type;
|
||||
|
||||
if (!jack)
|
||||
if (!jack || !jack->jack)
|
||||
return;
|
||||
|
||||
present = snd_hda_jack_detect(codec, nid);
|
||||
|
|
Reference in a new issue