From: Takashi Iwai <tiwai@suse.de>
Date: Fri, 11 Nov 2011 16:53:03 +0000 (+0100)
Subject: ALSA: hda/jack - Fix NULL-dereference at probing
X-Git-Tag: MMI-PSA29.97-13-9~16612^2~116^2~13^2~7
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=cfc7c9d307b6a3557e333f960218d344d3a70ce7;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

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>
---

diff --git a/sound/pci/hda/hda_jack.c b/sound/pci/hda/hda_jack.c
index eac002d01fd6..ef36cbb9e968 100644
--- a/sound/pci/hda/hda_jack.c
+++ b/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);