---

yaml --- r: 216709 b: refs/heads/master c: 265a024 h: refs/heads/master i: 216707: bbb1b9e v: v3
git-mirror · Sep 21, 2010 · ec2eaf2 · ec2eaf2
1 parent 31c4537
commit ec2eaf2
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9e5341b92d1d2dde11691b394721b45b36416bef
+refs/heads/master: 265a02478db5217eda8063004ded1ef0a461c240
diff --git a/trunk/sound/pci/hda/patch_realtek.c b/trunk/sound/pci/hda/patch_realtek.c
@@ -1087,15 +1087,19 @@ static int alc_init_jacks(struct hda_codec *codec)
 	unsigned int hp_nid = spec->autocfg.hp_pins[0];
 	unsigned int mic_nid = spec->ext_mic.pin;
 
-	err = alc_add_jack(codec, hp_nid, SND_JACK_HEADPHONE);
-	if (err < 0)
-		return err;
-	alc_report_jack(codec, hp_nid);
+	if (hp_nid) {
+		err = alc_add_jack(codec, hp_nid, SND_JACK_HEADPHONE);
+		if (err < 0)
+			return err;
+		alc_report_jack(codec, hp_nid);
+	}
 
-	err = alc_add_jack(codec, mic_nid, SND_JACK_MICROPHONE);
-	if (err < 0)
-		return err;
-	alc_report_jack(codec, mic_nid);
+	if (mic_nid) {
+		err = alc_add_jack(codec, mic_nid, SND_JACK_MICROPHONE);
+		if (err < 0)
+			return err;
+		alc_report_jack(codec, mic_nid);
+	}
 
 	return 0;
 }