From 9db1426389426e894c52bc6a9faf227129535f5a Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Mon, 10 Aug 2009 07:44:09 +0200
Subject: [PATCH] --- yaml --- r: 157839 b: refs/heads/master c:
 da2a2aaa8e3dddb41678af7e5295d9e3e6c030a4 h: refs/heads/master i:   157837:
 b445ed6f2b30342ca0085b2e441636b88c3eeb17   157835:
 12d38a6dae2a267d5dc86c5091ea874a61c8265d   157831:
 823386d548a10ae7bae9ed1bcc82937200b77f69   157823:
 5205898fb1fb13f47edc035fae464c255e8614e9 v: v3

---
 [refs]                               | 2 +-
 trunk/sound/pci/hda/patch_sigmatel.c | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c8a750c1b122..e06405cbb82e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1972d02504b142a6f1442bd987a8831146031d3d
+refs/heads/master: da2a2aaa8e3dddb41678af7e5295d9e3e6c030a4
diff --git a/trunk/sound/pci/hda/patch_sigmatel.c b/trunk/sound/pci/hda/patch_sigmatel.c
index 163aad599b6a..276073060576 100644
--- a/trunk/sound/pci/hda/patch_sigmatel.c
+++ b/trunk/sound/pci/hda/patch_sigmatel.c
@@ -3671,7 +3671,7 @@ static int set_mic_route(struct hda_codec *codec,
 		if (i < 0)
 			return -1;
 		mic->mux_idx = i;
-	}  else {
+	}  else if (spec->dmux_nids) {
 		/* digital pin */
 		mic->mux_idx = 0;
 		i = get_connection_index(codec, spec->dmux_nids[0], pin);
@@ -4373,7 +4373,8 @@ static int stac92xx_init(struct hda_codec *codec)
 	}
 	if (spec->auto_mic) {
 		/* initialize connection to analog input */
-		snd_hda_codec_write_cache(codec, spec->dmux_nids[0], 0,
+		if (spec->dmux_nids)
+			snd_hda_codec_write_cache(codec, spec->dmux_nids[0], 0,
 					  AC_VERB_SET_CONNECT_SEL, 0);
 		if (enable_pin_detect(codec, spec->ext_mic.pin, STAC_MIC_EVENT))
 			stac_issue_unsol_event(codec, spec->ext_mic.pin);