From 5d96a2c80826fb244d50aec093064086f6d83a21 Mon Sep 17 00:00:00 2001 From: Takashi Iwai Date: Fri, 11 Nov 2011 17:53:03 +0100 Subject: [PATCH] --- yaml --- r: 284209 b: refs/heads/master c: cfc7c9d307b6a3557e333f960218d344d3a70ce7 h: refs/heads/master i: 284207: 616f7ba3894ce18e15f000b5c56365a1dbca30ef v: v3 --- [refs] | 2 +- trunk/sound/pci/hda/hda_jack.c | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index e828b98ce867..b3887045709a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d1cb620081f51c78cf95224efb593a886875078f +refs/heads/master: cfc7c9d307b6a3557e333f960218d344d3a70ce7 diff --git a/trunk/sound/pci/hda/hda_jack.c b/trunk/sound/pci/hda/hda_jack.c index eac002d01fd6..ef36cbb9e968 100644 --- a/trunk/sound/pci/hda/hda_jack.c +++ b/trunk/sound/pci/hda/hda_jack.c @@ -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);